Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Showcase] Add posters galore (react-admin) #11939

Merged
merged 5 commits into from
Jun 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions docs/src/pages/discover-more/showcase/Showcase.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ const styles = theme => ({
});

const appList = [
{
title: 'Posters Galore',
description:
'The admin of an imaginary poster shop, used as a demo for the react-admin framework. ' +
'Uses many material-ui components, including tables, forms, snackbars, buttons, and ' +
'theming. The UI is responsive. The code is open-source!',
image: '/static/images/showcase/posters-galore.jpg',
link: 'https://marmelab.com/react-admin-demo/',
source:
'https://github.com/marmelab/react-admin/tree/be23a1a8ebc4e2293b57898adcb2f359e836f0fd/examples/demo',
},
{
title: 'Trafikito',
description:
Expand Down
30 changes: 15 additions & 15 deletions packages/material-ui-lab/src/Slider/Slider.d.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import * as React from "react";
import { StandardProps } from "@material-ui/core";
import { ButtonProps } from "@material-ui/core/Button";
import { TransitionProps } from "react-transition-group/Transition";
import { TransitionHandlerProps } from "@material-ui/core/transitions/transition";
import * as React from 'react';
import { StandardProps } from '@material-ui/core';
import { ButtonProps } from '@material-ui/core/Button';
import { TransitionProps } from 'react-transition-group/Transition';
import { TransitionHandlerProps } from '@material-ui/core/transitions/transition';

export interface SliderProps extends StandardProps<React.HTMLAttributes<HTMLDivElement>> {
disabled?: boolean;
reverse?: boolean;
vertical?: boolean;
max?: number;
min?: number;
step?: number;
value?: number;
onChange?: (event: React.ChangeEvent<{}>, value: number) => void;
onDragEnd?: (event: React.ChangeEvent<{}>) => void;
onDragStart?: (event: React.ChangeEvent<{}>) => void;
disabled?: boolean;
reverse?: boolean;
vertical?: boolean;
max?: number;
min?: number;
step?: number;
value?: number;
onChange?: (event: React.ChangeEvent<{}>, value: number) => void;
onDragEnd?: (event: React.ChangeEvent<{}>) => void;
onDragStart?: (event: React.ChangeEvent<{}>) => void;
}

declare const Slider: React.ComponentType<SliderProps>;
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/Slider/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default } from "./Slider";
export * from "./Slider";
export { default } from './Slider';
export * from './Slider';
2 changes: 1 addition & 1 deletion packages/material-ui/src/Tabs/Tabs.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export interface TabsProps
action?: (actions: TabsActions) => void;
centered?: boolean;
children?: React.ReactNode;
component?: React.ReactType<TabsProps>,
component?: React.ReactType<TabsProps>;
fullWidth?: boolean;
indicatorColor?: 'secondary' | 'primary' | string;
onChange?: (event: React.ChangeEvent<{}>, value: any) => void;
Expand Down
4 changes: 3 additions & 1 deletion packages/material-ui/src/styles/withStyles.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ export interface WithStylesOptions<ClassKey extends string = string>

export type ClassNameMap<ClassKey extends string = string> = Record<ClassKey, string>;

export type WithStyles<T extends string | StyleRules | StyleRulesCallback = string> = Partial<WithTheme> & {
export type WithStyles<T extends string | StyleRules | StyleRulesCallback = string> = Partial<
WithTheme
> & {
classes: ClassNameMap<
T extends string
? T
Expand Down
Binary file added static/images/showcase/posters-galore.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.