Skip to content

Commit

Permalink
Merge pull request #1 from callemall/master
Browse files Browse the repository at this point in the history
Sync with callemall
  • Loading branch information
DeviaVir committed Dec 4, 2014
2 parents 552f408 + 64fedb3 commit 56924c2
Show file tree
Hide file tree
Showing 190 changed files with 8,457 additions and 7,328 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
indent_style = tab
indent_size = 2
end_of_line = lf
charset = utf-8
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
121 changes: 118 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,125 @@
## 0.3.2
###### _Nov. 30, 2014_

##### General
- Upgraded dependencies: react 0.12.1, browserify 6.3.3, reactify: 0.17.1

##### Components
- Dialog
- Added key prop to dialog actions. (#99)
- Added onDismiss event callback. (#86)
- Dialog is now positioned onMound and onUpdate (#85)
- Fixed a bug that cuased dialog to not be vertically centered on long pages
- Dropdown Menu
- Added autoWidth prop (#89)
- Menu
- Added autoWidth prop
- Nested Menu
- Fixed bug that caused some nesteed menus to not show. (#88)
- Paper
- Updated to use spread operator
- Radio Button
- Fixed radio button label styles. (#94)
- Ripple
- Account for page scrolling on ripple animation. (#93)

## 0.3.1
###### _Nov. 28, 2014_

##### General
- Removed browserify react addons alias. (#68)

##### Components
- FlatButton, RaisedButton, and FloatingActionButton (NEW)
- These buttons will replace the current PaperButton which will be
depreciated in v.0.4.0.
- They generate actual button tags, are keyboard focusable and listen
to onTouchTap. (#50, #61)
- Icon Button
- Pressing enter when the button is in focus now fires onTouchTap
- Added dark theme ripple colors
- Focus and click animations now use Scale Transforms to improve performance.
- Input
- Added support for ReactLink and use JSX spread attributes
- Error messages are now props instead of internal states (#95)
- LeftNav
- Pressing ESC now closes the left nav
- PaperButton
- Will be depreciated in v.0.4.0.
- Radio Button
- Fixed toggle bug. (#70)

##### Mixins
- WindowListenable is now available from Mixins.WindowListenable

##### Utils
- Added KeyCodes constants

## 0.3.0
###### _Nov. 17, 2014_

##### General
- Updated Browserify & Reactify versions
- Enabled reactify es6 transformations
- Removed jQuery dependency (#25)
- Added reaact-tap-event-plugin dependency

##### Components
- Dialog
- Width is now determined by content
- Position is centered horizontally inside parent container
- Pressing Esc now closes the dialog (#35)
- Dropdown Menu
- Added underline (#39)
- Fixed display problem on double click (#43)
- Icon
- Transfer all props to underlying span
- Icon Button (New)
- Buttons...that are icons. :)
- Input
- Added required, min, max and step
- LeftNav
- Fixed left nav style when docked (#36)
- Transition now uses translate3d instead of left
- Overlay now listens to onTouchTap
- Menu Items
- Added user select none styles (#45)
- Paper
- Added onMouseOver & onMouseOut props
- Toolbar
- Items are now passed in as children instead of groupItem prop

##### Mixins
- Added WindowListenable. Allows listening to window events.

##### Utils
- Added Dom and Events utility functions
- Fixed a bug that caused CSS Events to bind twice

##### Less
- Added media query variables
- Added no-wrap mixin
- Removed unnecessary style resets
- Removed tab highlight color on all elements

## 0.2.2
###### _Nov. 11, 2014_
- Changed project structure to be less confusing. Material-UI components/styles live in the src directory.
Docs site code lives in the docs directory. This still allows us to easily test components in the docs site
as we are working on them
- Added .editorconfig to help keep code formatting consistent among contributors. See http://editorconfig.org/
- Fixed drop down display issue in safari
- Fixed nested menu arrow icon
- Added hover transitions to menus
- Improved ripple animation on buttons

## 0.2.1
###### Nov. 8, 2014
###### _Nov. 8, 2014_
- Fixed icon font reference. We're now including it as part of the project
instead of an npm dependency.

## 0.2.0
###### Nov. 7, 2014
###### _Nov. 7, 2014_
- Icon
- Added all font icons from the unoffical material design icon font:
https://github.com/designjockey/material-design-fonticons
Expand All @@ -22,7 +137,7 @@
- onLineBreak event now passes back event (e) on callback

## 0.1.29
###### Nov. 5, 2014
###### _Nov. 5, 2014_
- css fix on paper component
- hover transition fix on buttons
- removed selected state on drop down icon component
Expand Down
34 changes: 22 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,15 @@ Use [browserify](http://browserify.org/) and [reactify](https://github.com/andre

Once material-ui is included in your project, you can use the components this way:
```js
/**
* @jsx React.DOM
*/

var React = require('react'),
mui = require('material-ui'),
PaperButton = mui.PaperButton;
RaisedButton = mui.RaisedButton;

var SomeAwesomeComponent = React.createClass({

render: function() {
return (
<PaperButton type={PaperButton.Types.FLAT} label="Default" />
<RaisedButton label="Default" />
);
}

Expand All @@ -42,20 +38,34 @@ module.exports = SomeAwesomeComponent;
## Customization

The styles are separated into 2 less files:
* dist/less/scaffolding.less
* dist/less/components.less
* src/less/scaffolding.less
* src/less/components.less

This allows you to override any variables defined in [custom-variables.less](https://github.com/callemall/material-ui/blob/master/dist/less/variables/custom-variables.less) without having to modify material-ui source files directly. For example, your main.less file could look something like this:
This allows you to override any variables defined in [custom-variables.less](https://github.com/callemall/material-ui/blob/master/src/less/variables/custom-variables.less) without having to modify material-ui source files directly. For example, your main.less file could look something like this:
```css
@import "node_modules/material-ui/dist/less/scaffolding.less";
@import "node_modules/material-ui/src/less/scaffolding.less";

//Define a custom less file to override any variables defined in scaffolding.less
@import "my-custom-overrides.less";

@import "node_modules/material-ui/dist/less/components.less";
@import "node_modules/material-ui/src/less/components.less";
```

## Building the Documentation Site
After cloning the repository, install dependencies:
```
cd <project folder>/material-ui
npm install
cd <project folder>/material-ui/docs
npm install
npm install -g gulp
```

Now you can run your local server:
```
gulp
```

## Contribute

[Material-UI](http://www.material-ui.com/) came about from our love of [React](http://facebook.github.io/react/) and [Google's Material Design](https://www.google.com/design/spec/material-design/introduction.html). We're currently using it on a project at [Call-Em-All](https://www.call-em-all.com/) and plan on adding to it and making it better. If you'd like to help, check out the [docs folder](https://github.com/callemall/material-ui/tree/master/docs). We'd greatly appreciate any contribution you make. :)

4 changes: 3 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# [Material-UI](http://callemall.github.io/material-ui/)

This is the documentation site for [Material-UI](http://callemall.github.io/material-ui/).
This is the documentation site for [Material-UI](http://callemall.github.io/material-ui/).

## Development Installation Notes
After cloning the repository, install dependencies:
```
cd <project folder>/material-ui
npm install
cd <project folder>/material-ui/docs
npm install
npm install -g gulp
Expand Down
25 changes: 0 additions & 25 deletions docs/dist/index.js

This file was deleted.

45 changes: 0 additions & 45 deletions docs/dist/js/app-bar.jsx

This file was deleted.

81 changes: 0 additions & 81 deletions docs/dist/js/dialog.jsx

This file was deleted.

Loading

0 comments on commit 56924c2

Please sign in to comment.