Merge branch 'master' of https://github.com/callemall/material-ui int…

…o select-field

.eslintignore

@@ -0,0 +1,2 @@
+src/utils/modernizr.custom.js
+src/svg-icons

.eslintrc

@@ -10,20 +10,17 @@
     "comma-spacing": 0,
     "eqeqeq": 0,
     "key-spacing": 0,
-    "no-multi-spaces": 0,
     "no-underscore-dangle": 0,
     "no-unused-expressions": 0,
-    "no-unused-vars": 0,
-    "no-sequences": 0,
     "no-shadow": 0,
     "no-shadow-restricted-names": 0,
     "no-extend-native": 0,
-    "no-undef": 0,
     "new-cap": 0,
     "quotes": 0,
     "semi-spacing": 0,
     "space-unary-ops": 0,
     "space-infix-ops": 0,
+    "consistent-return": 0,
     "strict": 0
   },
   "parser": "babel-eslint",

docs/gulp/tasks/eslint.js

@@ -1,7 +1,16 @@
 var gulp = require('gulp');
-var shell = require('gulp-shell');
+var eslint = require('gulp-eslint');
 var handleErrors = require('../util/handleErrors');
 
-gulp.task('eslint', shell.task([
-  '"../node_modules/.bin/eslint" ../src'
-])).on('error', handleErrors);
+gulp.task('eslint', function () {
+  return gulp.src(['../src/**'])
+    // eslint() attaches the lint output to the eslint property
+    // of the file object so it can be used by other modules.
+    .pipe(eslint())
+    // eslint.format() outputs the lint results to the console.
+    // Alternatively use eslint.formatEach() (see Docs).
+    .pipe(eslint.format())
+    // To have the process exit with an error code (1) on
+    // lint error, return the stream and pipe to failOnError last.
+    .pipe(eslint.failOnError());
+}).on('error', handleErrors);

docs/package.json

@@ -14,6 +14,7 @@
     "browser-sync": "^1.8.1",
     "browserify": "^10.2.0",
     "gulp": "^3.8.10",
+    "gulp-eslint": "^0.15.0",
     "gulp-notify": "^2.1.0",
     "gulp-shell": "^0.4.1",
     "gulp-sourcemaps": "1.5.2",

docs/src/app/components/pages/components/icon-buttons.jsx

@@ -21,9 +21,9 @@ class IconButtonsPage extends React.Component {
         '<IconButton tooltip="Sort" disabled={true}>\n' +
         '  <FontIcon className="muidocs-icon-custom-sort"/>\n' +
         '</IconButton>\n\n' +
-        '//Adding tooltipPosition to Icon Button\n' +
-        '<IconButton iconClassName="muidocs-icon-custom-github" tooltip="bottom-right"\n' +
-        '            tooltipPosition="bottom-right"/>\n';
+        '//Method 4: Using Google material-icons\n' + 
+        ' <IconButton className="material-icons" tooltipAlignment="bottom-center" \n' + 
+        '  tooltip="Sky">settings_system_daydream</IconButton>';
 
     let desc = (
       <p>
@@ -50,6 +50,10 @@ class IconButtonsPage extends React.Component {
             similiar to how the iconClassName prop from method 1 is
             handled.
           </li>
+          <li>
+            Google Material Icons: Now also supported for iconButtons by passing "material-icons" in 
+            iconClassName prop.
+          </li>
         </ol>
       </p>
     );
@@ -168,6 +172,9 @@ class IconButtonsPage extends React.Component {
         <IconButton tooltip="Sort" disabled={true}>
           <FontIcon className="muidocs-icon-custom-sort"/>
         </IconButton>
+        <br/><br/><br/>
+
+        <IconButton iconClassName="material-icons" tooltip="Sky">settings_system_daydream</IconButton>
       </ComponentDoc>
     );