Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/callemall/next' into next-…
Browse files Browse the repository at this point in the history
…select-field
  • Loading branch information
kybarg committed Apr 10, 2017
2 parents 4dace18 + 1216598 commit cb89d48
Show file tree
Hide file tree
Showing 147 changed files with 4,322 additions and 505 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
es6: true,
browser: true,
node: true,
mocha: true,
},
extends: 'airbnb',
parser: 'babel-eslint',
Expand Down
1 change: 1 addition & 0 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ esproposal.class_instance_fields=enable

module.name_mapper='.*\.\(html\|css\|svg\|png\|jpg\|gif\)$' -> '<PROJECT_ROOT>/flow/stubs/url-loader.js'
module.name_mapper='^material-ui\/\(.*\)$' -> '<PROJECT_ROOT>/src/\1'
module.name_mapper='^material-ui-docs\/\(.*\)$' -> '<PROJECT_ROOT>/docs/\1'

module.system.node.resolve_dirname=node_modules
module.system.node.resolve_dirname=.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,32 @@ Below is a summary of major changes.
- [Ripple/TouchRipple] Refactored and now works properly inside a button in firefox!
- [Button] Raised/flat/fab are now combined into a single component.

## 1.0.0-alpha.7
###### _Mar 12, 2017_

##### Component Fixes / Enhancements

- [Slide] Fix displaying when in=false at first (#6223) @ArcanisCz
- [Ripple] Improve the animation (#6248) @oliviertassinari
- [color] Add missing blueGrey color (#6255) @Shahrukh-Zindani
- [Table] Fix paddings according to guidelines (#6306) @kybarg
- [Table] Replace font icon to svg icon in sort label (#6321) @kybarg
- [Table] Add visual regression tests (#6325) @oliviertassinari
- [Button] Use faded text color for hover state (#6320) @mbrookes

##### Docs

- [docs] Add a Color section (#6254) @Shahrukh-Zindani
- [docs] Add information to typography (#6266) @Shahrukh-Zindani

##### Core

- [test] Server side render some element to be sure (#6328) @oliviertassinari
- [npm] Add correct extension (#6241) @okvic77
- [core] Rename travis to circle as we migrated (e7fba22bd19f82f5489cb52eaaaaff23f2f57939) @oliviertassinari
- [core] Fix docs:start command on Windows (#6307) @kybarg
- [core] Upgrade the npm dependencies (#6327) @oliviertassinari

## 1.0.0-alpha.6
###### _Feb 26, 2017_

Expand Down
2 changes: 1 addition & 1 deletion docs/api/Layout/Layout.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Props
| md | enum:&nbsp;true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12<br> | | Defines the number of grids the component is going to use. It's applied for the `md` breakpoint and wider screens if not overridden. |
| lg | enum:&nbsp;true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12<br> | | Defines the number of grids the component is going to use. It's applied for the `lg` breakpoint and wider screens if not overridden. |
| xl | enum:&nbsp;true, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12<br> | | Defines the number of grids the component is going to use. It's applied for the `xl` breakpoint and wider screens. |
| align | enum:&nbsp;"flex-start"<br>&nbsp;'center'<br>&nbsp;'flex-end'<br>&nbsp;'stretch'<br> | 'flex-start' | Defines the `align-items` style property. It's applied for all the screen sizes. |
| align | enum:&nbsp;"flex-start"<br>&nbsp;'center'<br>&nbsp;'flex-end'<br>&nbsp;'stretch'<br> | 'stretch' | Defines the `align-items` style property. It's applied for all the screen sizes. |
| direction | enum:&nbsp;"row"<br>&nbsp;'row-reverse'<br>&nbsp;'column'<br>&nbsp;'column-reverse'<br> | 'row' | Defines the `flex-direction` style property. It's applied for all the screen sizes. |
| gutter | enum:&nbsp;0, 8, 16, 24, 40<br> | 16 | Defines the space between the type `item` component. It can only be used on a type `container` component. |
| justify | enum:&nbsp;"flex-start", 'center', 'flex-end', 'space-between', 'space-around'<br> | 'flex-start' | Defines the `justify-content` style property. It's applied for all the screen sizes. |
Expand Down
9 changes: 8 additions & 1 deletion docs/api/List/List.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
List
====

A simple list component.
A material list root element.

```jsx
<List>
<ListItem>....</ListItem>
</List>
```

Props
-----
Expand All @@ -11,6 +17,7 @@ Props
| children | node | | |
| className | string | | The CSS class name of the root element. |
| component | union:&nbsp;string<br>&nbsp;func<br> | 'div' | The component used for the root node. Either a string to use a DOM element or a ReactElement. |
| dense | bool | false | |
| padding | bool | true | |
| subheader | node | | |

Expand Down
14 changes: 14 additions & 0 deletions docs/api/List/ListItemAvatar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ListItemAvatar
==============



Props
-----

| Name | Type | Default | Description |
|:-----|:-----|:--------|:------------|
| <span style="color: #31a148">children *</span> | element | | |
| className | string | | The CSS class name of the root element. |

Any other properties supplied will be spread to the root element.
125 changes: 125 additions & 0 deletions docs/getting-started/supported-components.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
# Supported Components

The following is a list of Material Design components & features.
Those currently supported by Material-UI are **highlighted ✓**.

While we strive to follow the guidelines where practical (applying
common sense where guidelines contadict - a more common occurence than
one might expect), we do not expect to support every component, or every
feature of every component, but rather to provide the building blocks to
allow developers to create compelling user interfaces and experiences.

If you wish to add support for a component or feature not highlighted
here, please search for the relevant [GitHub Issue](https://github.com/callemall/material-ui/issues), or create a new one
to discuss the approach before submitting a PR.

- **[App Bar](https://material.io/guidelines/layout/structure.html#structure-app-bar)**
- [App shortcut icons](https://material.io/guidelines/style/icons.html#icons-app-shortcut-icons)
- Icon
- Avatar
- Group avatar
- **[Bottom navigation](https://www.google.com/design/spec/components/bottom-navigation.html)**
- [Bottom sheets](https://www.google.com/design/spec/components/bottom-sheets.html)
- **[Buttons](http://www.material-ui.com/#/components/buttons)**
- **[Flat & raised buttons](https://www.google.com/design/spec/components/buttons.html#buttons-flat-raised-buttons)**
- [Toggle buttons](https://www.google.com/design/spec/components/buttons.html#buttons-toggle-buttons)
- **[Icon toggles](https://www.google.com/design/spec/components/buttons.html#buttons-toggle-buttons) (Custom Checkbox) ✓**
- [Dropdown: Mobile: Dropdown buttons](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons) (DropDownMenu)
- [Dropdown: Mobile: Generic overflow](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons)
- [Dropdown: Mobile: Segmented](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons)
- [Dropdown: Mobile: Editable segmented](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons)
- [Dropdown: Desktop: Dropdown buttons](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons)
- **[Buttons: Floating Action Button](https://www.google.com/design/spec/components/buttons-floating-action-button.html)**
- **[Trigger](https://www.google.com/design/spec/components/buttons-floating-action-button.html#buttons-floating-action-button-transitions)**
- [Toolbar](https://www.google.com/design/spec/components/buttons-floating-action-button.html#buttons-floating-action-button-transitions)
- [Speed dial](https://www.google.com/design/spec/components/buttons-floating-action-button.html#buttons-floating-action-button-transitions)
- [Morph](http://www.google.com/design/spec/components/buttons-floating-action-button.html#buttons-floating-action-button-transitions)
- [Full screen](http://www.google.com/design/spec/components/buttons-floating-action-button.html#buttons-floating-action-button-transitions)
- **[Cards](https://www.google.com/design/spec/components/cards.html)**
- **[Chips](https://www.google.com/design/spec/components/chips.html)**
- **[Standard](https://www.google.com/design/spec/components/chips.html)**
- [Contact](https://www.google.com/design/spec/components/chips.html#chips-contact-chips)
- **[Data tables](https://www.google.com/design/spec/components/data-tables.html)**
- **Sortable ✓**
- **Selectable ✓**
- Pagination
- **[Dialogs](https://www.google.com/design/spec/components/dialogs.html)**
- **[Alerts](https://www.google.com/design/spec/components/dialogs.html#dialogs-alerts)**
- **[Simple menus](https://www.google.com/design/spec/components/dialogs.html#dialogs-simple-menus) (Menu) ✓**
- **[Simple dialogs](https://www.google.com/design/spec/components/dialogs.html#dialogs-simple-dialogs) (Can be constructed with Dialog and List.) ✓**
- **[Confirmation dialogs](https://www.google.com/design/spec/components/dialogs.html#dialogs-confirmation-dialogs)**
- **[Full screen dialogs](https://www.google.com/design/spec/components/dialogs.html#dialogs-full-screen-dialogs)**
- **[Dividers](https://www.google.com/design/spec/components/dividers.html)**
- **[Full bleed](https://www.google.com/design/spec/components/dividers.html#dividers-types-of-dividers)**
- **[Inset](https://www.google.com/design/spec/components/dividers.html#dividers-types-of-dividers)**
- [Expansion Panels](https://www.google.com/design/spec/components/expansion-panels.html)
- [Grid lists](https://www.google.com/design/spec/components/grid-lists.html)
- **[Lists](https://www.google.com/design/spec/components/lists.html)**
- **[Single line](https://www.google.com/design/spec/components/lists.html#lists-specs)**
- **[Two line](https://www.google.com/design/spec/components/lists.html#lists-specs)**
- [Three line](https://www.google.com/design/spec/components/lists.html#lists-specs)
- **[Avatar](https://www.google.com/design/spec/components/lists.html#lists-specs)**
- **[Icon](https://www.google.com/design/spec/components/lists.html#lists-specs)**
- **[Lists: Controls](https://www.google.com/design/spec/components/lists-controls.html)**
- **[Checkbox](https://www.google.com/design/spec/components/lists-controls.html#lists-controls-types-of-list-controls) (Primary only) ✓**
- **[Switch](https://www.google.com/design/spec/components/lists-controls.html#lists-controls-types-of-list-controls) (Toggle) ✓**
- [Reorder](https://www.google.com/design/spec/components/lists-controls.html#lists-controls-types-of-list-controls)
- [Expand/collapse](https://www.google.com/design/spec/components/lists-controls.html#lists-controls-types-of-list-controls)
- [Leave-behinds](https://www.google.com/design/spec/components/lists-controls.html#lists-controls-types-of-list-controls)
- **[Menus](https://www.google.com/design/spec/components/menus.html)**
- **[Button menu](https://www.google.com/design/spec/components/menus.html#menus-usage) (Can be constructed) ✓**
- [Scrollable](https://www.google.com/design/spec/components/menus.html#menus-usage)
- [Cascade](https://www.google.com/design/spec/components/menus.html#menus-usage)
- [Textfield dropdown](https://www.google.com/design/spec/components/menus.html#menus-behavior) (DropDownMenu)
- [Contextual / App bar dropdown](https://www.google.com/design/spec/components/menus.html#menus-usage) (IconMenu)
- **[Simple menus](https://www.google.com/design/spec/components/menus.html#menus-simple-menus) (Menu) ✓**
- [Pickers](https://www.google.com/design/spec/components/pickers.html)
- [Date picker](https://www.google.com/design/spec/components/pickers.html#pickers-date-pickers)
- [Time picker](https://www.google.com/design/spec/components/pickers.html#pickers-time-pickers)
- **[Progress & activity](https://www.google.com/design/spec/components/progress-activity.html)**
- **[Linear](https://www.google.com/design/spec/components/progress-activity.html#progress-activity-types-of-indicators)**
- **[Circular](https://www.google.com/design/spec/components/progress-activity.html#progress-activity-types-of-indicators)**
- **[Circular with integration](https://www.google.com/design/spec/components/progress-activity.html#progress-activity-types-of-indicators)**
- **[Loading](https://www.google.com/design/spec/components/progress-activity.html#progress-activity-types-of-indicators)**
- **[Selection controls](https://www.google.com/design/spec/components/selection-controls.html)**
- **[Checkbox](https://www.google.com/design/spec/components/selection-controls.html#selection-controls-checkbox)**
- **[Radio button](https://www.google.com/design/spec/components/selection-controls.html#selection-controls-radio-button)**
- **[Switch](https://www.google.com/design/spec/components/selection-controls.html#selection-controls-switch)**
- [Sliders](https://www.google.com/design/spec/components/sliders.html)
- [Continuous](https://www.google.com/design/spec/components/sliders.html#sliders-continuous-slider)
- [Discrete](https://www.google.com/design/spec/components/sliders.html#sliders-discrete-slider)
- [Snackbars](https://www.google.com/design/spec/components/snackbars-toasts.html)
- **[Subheaders](https://www.google.com/design/spec/components/subheaders.html)**
- **[List](https://www.google.com/design/spec/components/subheaders.html#subheaders-list-subheaders)**
- [Grid](https://www.google.com/design/spec/components/subheaders.html#subheaders-list-subheaders)
- [Menu](https://www.google.com/design/spec/components/subheaders.html#subheaders-list-subheaders)
- [Steppers](https://www.google.com/design/spec/components/steppers.html)
- [Horizontal](https://www.google.com/design/spec/components/steppers.html#steppers-types-of-steppers)
- [Vertical](https://www.google.com/design/spec/components/steppers.html#steppers-types-of-steppers)
- **[Tabs](https://www.google.com/design/spec/components/tabs.html)**
- Usage
- **Mobile (Full width) ✓**
- **Desktop (Left aligned AKA Basic) ✓**
- **Centered ✓**
- [Dropdown](https://www.google.com/design/spec/components/tabs.html#tabs-usage)
- [Overflow pagination](https://www.google.com/design/spec/components/tabs.html#tabs-usage)
- Label
- **[Text](https://www.google.com/design/spec/components/tabs.html#tabs-usage)**
- **[Icon](https://www.google.com/design/spec/components/tabs.html#tabs-usage)**
- **[Icon and text](https://www.google.com/design/spec/components/tabs.html#tabs-usage)**
- **[Text fields](https://www.google.com/design/spec/components/text-fields.html)**
- **[Single-line](https://www.google.com/design/spec/components/text-fields.html#text-fields-single-line-text-field)**
- [Multi-line](https://www.google.com/design/spec/components/text-fields.html#text-fields-multi-line-text-field)
- [Full-width](https://www.google.com/design/spec/components/text-fields.html#text-fields-multi-line-text-field)
- [Character counter](https://www.google.com/design/spec/components/text-fields.html#text-fields-character-counter)
- [Auto-complete](https://www.google.com/design/spec/components/text-fields.html#text-fields-auto-complete-text-field)
- [Search filter](https://www.google.com/design/spec/components/text-fields.html#text-fields-search-filter)
- [Password](https://www.google.com/design/spec/components/text-fields.html#text-fields-password-input)
- [Toolbars](https://www.google.com/design/spec/components/toolbars.html)
- [Tooltips](https://www.google.com/design/spec/components/tooltips.html) (IconButton & TableHeader only)
- [Desktop](https://www.google.com/design/spec/components/tooltips.html#tooltips-tooltips-desktop-)
- [Mobile](https://www.google.com/design/spec/components/tooltips.html#tooltips-tooltips-mobile-)
- [Widgets](https://material.io/guidelines/components/widgets.html)
- [Information widgets](https://material.io/guidelines/components/widgets.html#widgets-types-of-widgets)
- [Collection widgets](https://material.io/guidelines/components/widgets.html#widgets-types-of-widgets)
- [Control widgets](https://material.io/guidelines/components/widgets.html#widgets-types-of-widgets)
6 changes: 3 additions & 3 deletions docs/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
"devDependencies": {
"babel-cli": "^6.23.0",
"babel-loader": "^6.3.2",
"babel-loader": "^6.4.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-1": "^6.22.0",
"cross-env": "^3.1.4",
"css-loader": "^0.26.2",
"cross-env": "^3.2.3",
"css-loader": "^0.27.1",
"file-loader": "^0.10.1",
"img-loader": "^1.3.1",
"object-assign": "^4.1.1",
Expand Down
7 changes: 7 additions & 0 deletions docs/site/src/components/AppRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ export default function AppRouter() {
component={MarkdownDocs}
nav
/>
<Route
title="Supported Components"
path="/getting-started/supported-components"
content={requireDocs('./getting-started/supported-components.md')}
component={MarkdownDocs}
nav
/>
</Route>
<Route
title="Customization"
Expand Down
Loading

0 comments on commit cb89d48

Please sign in to comment.