diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000000..4cab1f4d267628 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto diff --git a/docs/gulp/config.js b/docs/gulp/config.js index 3077da0b709b44..ac44b8262975b9 100644 --- a/docs/gulp/config.js +++ b/docs/gulp/config.js @@ -1,5 +1,5 @@ var dest = './build', - src = './src' + src = './src', mui = '../src'; module.exports = { diff --git a/docs/gulp/tasks/browserify.js b/docs/gulp/tasks/browserify.js index ab1f2ddcafec95..06922736dd03ba 100644 --- a/docs/gulp/tasks/browserify.js +++ b/docs/gulp/tasks/browserify.js @@ -57,7 +57,7 @@ gulp.task('browserify', function(callback) { var reportFinished = function() { // Log when bundling completes - bundleLogger.end(bundleConfig.outputName) + bundleLogger.end(bundleConfig.outputName); if(bundleQueue) { bundleQueue--; diff --git a/docs/gulp/tasks/fonts.js b/docs/gulp/tasks/fonts.js index 9db4ebd3575166..6263718f20a079 100644 --- a/docs/gulp/tasks/fonts.js +++ b/docs/gulp/tasks/fonts.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').fonts +var config = require('../config').fonts; gulp.task('fonts', function() { return gulp.src(config.src) diff --git a/docs/gulp/tasks/less.js b/docs/gulp/tasks/less.js index 6f4ba19b80f249..620d44374b90ee 100644 --- a/docs/gulp/tasks/less.js +++ b/docs/gulp/tasks/less.js @@ -2,7 +2,7 @@ var gulp = require('gulp'), less = require('gulp-less'), sourcemaps = require('gulp-sourcemaps'), handleErrors = require('../util/handleErrors'), - config=require('../config').less; + config = require('../config').less; gulp.task('less', function() { return gulp.src(config.src) diff --git a/docs/gulp/tasks/markup.js b/docs/gulp/tasks/markup.js index bc64223f1c8b1a..a3d22948827249 100644 --- a/docs/gulp/tasks/markup.js +++ b/docs/gulp/tasks/markup.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').markup +var config = require('../config').markup; gulp.task('markup', function() { return gulp.src(config.src) diff --git a/docs/gulp/tasks/mui-fonts.js b/docs/gulp/tasks/mui-fonts.js index a3840a70fa3153..295be5c67c573e 100644 --- a/docs/gulp/tasks/mui-fonts.js +++ b/docs/gulp/tasks/mui-fonts.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').muiFonts +var config = require('../config').muiFonts; gulp.task('muiFonts', function() { return gulp.src(config.src) diff --git a/docs/gulp/tasks/svgs.js b/docs/gulp/tasks/svgs.js index be7c11b30c88b9..b471222aafe914 100644 --- a/docs/gulp/tasks/svgs.js +++ b/docs/gulp/tasks/svgs.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').svgs +var config = require('../config').svgs; gulp.task('svgs', function() { return gulp.src(config.src) diff --git a/docs/gulp/tasks/watch.js b/docs/gulp/tasks/watch.js index c40467afaaedce..4c93af6e3891dd 100644 --- a/docs/gulp/tasks/watch.js +++ b/docs/gulp/tasks/watch.js @@ -4,10 +4,10 @@ - gulp/tasks/browserSync.js watches and reloads compiled files */ -var gulp = require('gulp'); -var config= require('../config'); +var gulp = require('gulp'); +var config = require('../config'); gulp.task('watch', ['setWatch', 'browserSync'], function() { - gulp.watch(config.less.watch, ['less']); + gulp.watch(config.less.watch, ['less']); gulp.watch(config.markup.src, ['markup']); }); diff --git a/docs/src/app/components/pages/components/buttons.jsx b/docs/src/app/components/pages/components/buttons.jsx index 638cf24bd91993..20b5e76831ff76 100644 --- a/docs/src/app/components/pages/components/buttons.jsx +++ b/docs/src/app/components/pages/components/buttons.jsx @@ -161,4 +161,4 @@ var ButtonPage = React.createClass({ }); -module.exports = ButtonPage; \ No newline at end of file +module.exports = ButtonPage; diff --git a/docs/src/app/components/pages/components/inputs.jsx b/docs/src/app/components/pages/components/inputs.jsx index 0111845371cf39..954e6cf6e4e5f0 100644 --- a/docs/src/app/components/pages/components/inputs.jsx +++ b/docs/src/app/components/pages/components/inputs.jsx @@ -42,4 +42,4 @@ var InputsPage = React.createClass({ }); -module.exports = InputsPage; \ No newline at end of file +module.exports = InputsPage; diff --git a/docs/src/app/components/pages/components/toasts.jsx b/docs/src/app/components/pages/components/toasts.jsx index 031c320ad6e48e..f5e416bb6e17bc 100644 --- a/docs/src/app/components/pages/components/toasts.jsx +++ b/docs/src/app/components/pages/components/toasts.jsx @@ -8,7 +8,7 @@ var ToastsPage = React.createClass({ return { message: 'You have deleted your broadcast.', action: 'undo' - } + }; }, render: function() { @@ -38,4 +38,4 @@ var ToastsPage = React.createClass({ }); -module.exports = ToastsPage; \ No newline at end of file +module.exports = ToastsPage; diff --git a/docs/src/app/components/pages/get-started.jsx b/docs/src/app/components/pages/get-started.jsx index 875b4f4acedbdc..0324c27161d1c5 100644 --- a/docs/src/app/components/pages/get-started.jsx +++ b/docs/src/app/components/pages/get-started.jsx @@ -1,6 +1,6 @@ var React = require('react'), mui = require('mui'), - CodeBlock = require('../code-example/code-block.jsx');; + CodeBlock = require('../code-example/code-block.jsx'); var GetStarted = React.createClass({ @@ -102,4 +102,4 @@ var GetStarted = React.createClass({ }); -module.exports = GetStarted; \ No newline at end of file +module.exports = GetStarted; diff --git a/example/gulp/config.js b/example/gulp/config.js index b55e9f024ea8b3..cf700a8fd1f789 100644 --- a/example/gulp/config.js +++ b/example/gulp/config.js @@ -1,5 +1,5 @@ var dest = './build', - src = './src' + src = './src', mui = './node_modules/material-ui/src'; module.exports = { diff --git a/example/gulp/tasks/browserify.js b/example/gulp/tasks/browserify.js index ab1f2ddcafec95..06922736dd03ba 100644 --- a/example/gulp/tasks/browserify.js +++ b/example/gulp/tasks/browserify.js @@ -57,7 +57,7 @@ gulp.task('browserify', function(callback) { var reportFinished = function() { // Log when bundling completes - bundleLogger.end(bundleConfig.outputName) + bundleLogger.end(bundleConfig.outputName); if(bundleQueue) { bundleQueue--; diff --git a/example/gulp/tasks/fonts.js b/example/gulp/tasks/fonts.js index 9db4ebd3575166..6263718f20a079 100644 --- a/example/gulp/tasks/fonts.js +++ b/example/gulp/tasks/fonts.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').fonts +var config = require('../config').fonts; gulp.task('fonts', function() { return gulp.src(config.src) diff --git a/example/gulp/tasks/less.js b/example/gulp/tasks/less.js index 6f4ba19b80f249..620d44374b90ee 100644 --- a/example/gulp/tasks/less.js +++ b/example/gulp/tasks/less.js @@ -2,7 +2,7 @@ var gulp = require('gulp'), less = require('gulp-less'), sourcemaps = require('gulp-sourcemaps'), handleErrors = require('../util/handleErrors'), - config=require('../config').less; + config = require('../config').less; gulp.task('less', function() { return gulp.src(config.src) diff --git a/example/gulp/tasks/markup.js b/example/gulp/tasks/markup.js index bc64223f1c8b1a..a3d22948827249 100644 --- a/example/gulp/tasks/markup.js +++ b/example/gulp/tasks/markup.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').markup +var config = require('../config').markup; gulp.task('markup', function() { return gulp.src(config.src) diff --git a/example/gulp/tasks/mui-fonts.js b/example/gulp/tasks/mui-fonts.js index a3840a70fa3153..295be5c67c573e 100644 --- a/example/gulp/tasks/mui-fonts.js +++ b/example/gulp/tasks/mui-fonts.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').muiFonts +var config = require('../config').muiFonts; gulp.task('muiFonts', function() { return gulp.src(config.src) diff --git a/example/gulp/tasks/svgs.js b/example/gulp/tasks/svgs.js index be7c11b30c88b9..b471222aafe914 100644 --- a/example/gulp/tasks/svgs.js +++ b/example/gulp/tasks/svgs.js @@ -1,5 +1,5 @@ var gulp = require('gulp'); -var config = require('../config').svgs +var config = require('../config').svgs; gulp.task('svgs', function() { return gulp.src(config.src) diff --git a/example/gulp/tasks/watch.js b/example/gulp/tasks/watch.js index c40467afaaedce..4c93af6e3891dd 100644 --- a/example/gulp/tasks/watch.js +++ b/example/gulp/tasks/watch.js @@ -4,10 +4,10 @@ - gulp/tasks/browserSync.js watches and reloads compiled files */ -var gulp = require('gulp'); -var config= require('../config'); +var gulp = require('gulp'); +var config = require('../config'); gulp.task('watch', ['setWatch', 'browserSync'], function() { - gulp.watch(config.less.watch, ['less']); + gulp.watch(config.less.watch, ['less']); gulp.watch(config.markup.src, ['markup']); }); diff --git a/example/src/less/custom-overrides.less b/example/src/less/custom-overrides.less index f8d40620bf1a68..058dfd532fbf10 100644 --- a/example/src/less/custom-overrides.less +++ b/example/src/less/custom-overrides.less @@ -1,2 +1,2 @@ //Override Variables in scaffolding.less -@accent-1-color: @orange-A200; \ No newline at end of file +@accent-1-color: @orange-A200;