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

Add missing semicolon, spaces and gitattributes #142

Merged
merged 2 commits into from
Dec 13, 2014
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
2 changes: 1 addition & 1 deletion docs/gulp/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var dest = './build',
src = './src'
src = './src',
mui = '../src';

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion docs/gulp/tasks/browserify.js
Original file line number Diff line number Diff line change
Expand Up @@ -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--;
Expand Down
2 changes: 1 addition & 1 deletion docs/gulp/tasks/fonts.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/gulp/tasks/less.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/gulp/tasks/markup.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/gulp/tasks/mui-fonts.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/gulp/tasks/svgs.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions docs/gulp/tasks/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
});
2 changes: 1 addition & 1 deletion docs/src/app/components/pages/components/buttons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ var ButtonPage = React.createClass({

});

module.exports = ButtonPage;
module.exports = ButtonPage;
2 changes: 1 addition & 1 deletion docs/src/app/components/pages/components/inputs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ var InputsPage = React.createClass({

});

module.exports = InputsPage;
module.exports = InputsPage;
4 changes: 2 additions & 2 deletions docs/src/app/components/pages/components/toasts.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var ToastsPage = React.createClass({
return {
message: 'You have deleted your broadcast.',
action: 'undo'
}
};
},

render: function() {
Expand Down Expand Up @@ -38,4 +38,4 @@ var ToastsPage = React.createClass({

});

module.exports = ToastsPage;
module.exports = ToastsPage;
4 changes: 2 additions & 2 deletions docs/src/app/components/pages/get-started.jsx
Original file line number Diff line number Diff line change
@@ -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({

Expand Down Expand Up @@ -102,4 +102,4 @@ var GetStarted = React.createClass({

});

module.exports = GetStarted;
module.exports = GetStarted;
2 changes: 1 addition & 1 deletion example/gulp/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var dest = './build',
src = './src'
src = './src',
mui = './node_modules/material-ui/src';

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion example/gulp/tasks/browserify.js
Original file line number Diff line number Diff line change
Expand Up @@ -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--;
Expand Down
2 changes: 1 addition & 1 deletion example/gulp/tasks/fonts.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion example/gulp/tasks/less.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion example/gulp/tasks/markup.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion example/gulp/tasks/mui-fonts.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion example/gulp/tasks/svgs.js
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 3 additions & 3 deletions example/gulp/tasks/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
});
2 changes: 1 addition & 1 deletion example/src/less/custom-overrides.less
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
//Override Variables in scaffolding.less
@accent-1-color: @orange-A200;
@accent-1-color: @orange-A200;