Skip to content

Commit 3888ecf

Browse files
authored
Merge pull request #1085 from junaidrsd/fix-exclude-global-styles-by-parameter
Fix #1082 exclude global styles by parameter
2 parents 4321368 + 2eab9b6 commit 3888ecf

File tree

5 files changed

+35
-1731
lines changed

5 files changed

+35
-1731
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ node_modules
33
npm-debug.log
44
.sass-cache
55
lib/app/js/components
6+
lib/app/css/styleguide-app.css
67
lib/dist
78
demo-output
89
phantomjs.log

gulpfile.babel.js

+2-17
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ gulp.task('js:app', () => {
3636
.pipe(gulp.dest(distPath + '/js'));
3737
});
3838

39-
/*jshint camelcase: false */
40-
var excludeDefaultStyles = process.env.npm_config_excludeDefaultStyles || false;
41-
4239
gulp.task('js:vendor', ['bower'], () => {
4340
return gulp.src(['lib/app/js/vendor/**/*.js'].concat(mainBowerFiles({filter: /\.js/})))
4441
.pipe(plumber())
@@ -50,7 +47,7 @@ gulp.task('bower', () => {
5047
return bower();
5148
});
5249

53-
gulp.task('copy:css', ['build:styleguide-app'], () => {
50+
gulp.task('copy:css', () => {
5451
return gulp.src('lib/app/css/**/*')
5552
.pipe(gulp.dest(distPath + '/css'));
5653
});
@@ -94,6 +91,7 @@ gulp.task('dev:generate', () => {
9491
rootPath: outputPath,
9592
overviewPath: 'README.md',
9693
styleVariables: 'lib/app/css/_styleguide_variables.css',
94+
excludeDefaultStyles: false,
9795
parsers: {
9896
css: 'postcss'
9997
}
@@ -127,19 +125,6 @@ gulp.task('dev:applystyles', () => {
127125
.pipe(gulp.dest(outputPath));
128126
});
129127

130-
gulp.task('build:styleguide-app', () => {
131-
var srcFiles = ['lib/app/css/_fontpath_and_mixin_definition.css'];
132-
133-
if (!excludeDefaultStyles) {
134-
srcFiles.push('lib/app/css/_styleguide_default_styles.css');
135-
}
136-
137-
srcFiles.push('lib/app/css/_custom_styles_mixin.css');
138-
return gulp.src(srcFiles)
139-
.pipe(concat('lib/app/css/styleguide-app.css'))
140-
.pipe(gulp.dest('.'));
141-
});
142-
143128
gulp.task('dev', ['dev:doc', 'dev:static', 'dev:applystyles'], () => {
144129
//Do intial full build and create styleguide
145130
runSequence('build:dist', 'dev:generate');

0 commit comments

Comments
 (0)