Skip to content

Commit 6739c83

Browse files
Merge pull request #2 from cssninjaStudio/@next
@next
2 parents 71b89da + b6c738c commit 6739c83

File tree

170 files changed

+16719
-21886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+16719
-21886
lines changed

bulma-css-vars.config.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const { hsl } = require('bulma-css-vars')
2+
3+
const appColors = {
4+
white: '#fff',
5+
primary: hsl(226, 77, 56), // '#3861e5',
6+
dark: hsl(226, 34, 24), // '#283252',
7+
link: hsl(229, 53, 53), // '#485fc7',
8+
info: hsl(200, 97, 45), // '#039be5',
9+
success: hsl(164, 95, 43), // '#06d6a0',
10+
warning: hsl(35, 95, 62), // '#faae42',
11+
danger: hsl(341, 79, 53), // '#e62965',
12+
}
13+
14+
module.exports = {
15+
jsOutputFile: 'src/scss/bulma-generated/bulma-colors.ts',
16+
sassOutputFile: 'src/scss/bulma-generated/generated-vars.sass',
17+
cssFallbackOutputFile: 'src/scss/bulma-generated/generated-fallback.css',
18+
colorDefs: appColors,
19+
sassEntryFile: 'src/scss/main.scss',
20+
transition: null,
21+
}

config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
config: {
33
port: 9050
44
},

debug.log

Lines changed: 0 additions & 2 deletions
This file was deleted.

gulpfile.js

Lines changed: 38 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
const { src, dest, task, watch, series, parallel } = require('gulp');
2-
const del = require('del');
3-
const options = require("./config");
4-
const browserSync = require('browser-sync').create();
5-
6-
const sass = require('gulp-sass');
7-
const bourbon = require('node-bourbon').includePaths;
8-
const postcss = require('gulp-postcss');
9-
const concat = require('gulp-concat');
10-
const uglify = require('gulp-uglify');
11-
const imagemin = require('gulp-imagemin');
12-
const cleanCSS = require('gulp-clean-css');
13-
const purgecss = require('gulp-purgecss');
14-
const sourcemaps = require('gulp-sourcemaps');
15-
const autoprefixer = require('gulp-autoprefixer');
16-
const panini = require('panini');
17-
18-
const browserify = require("browserify");
19-
const babelify = require("babelify");
20-
const source = require("vinyl-source-stream");
21-
const nodepath = 'node_modules/';
22-
23-
sass.compiler = require('sass');
1+
import gulp from "gulp";
2+
3+
import gulpSass from "gulp-sass";
4+
import bourbon from "node-bourbon";
5+
import concat from "gulp-concat";
6+
import imagemin from "gulp-imagemin";
7+
import sourcemaps from "gulp-sourcemaps";
8+
import autoprefixer from "gulp-autoprefixer";
9+
import panini from "panini";
10+
import sassCompiler from "sass";
11+
import del from "del";
12+
import browserify from "browserify";
13+
import babelify from "babelify";
14+
import source from "vinyl-source-stream";
15+
import logSymbols from "log-symbols";
16+
import BrowserSync from "browser-sync";
17+
18+
import options from "./config.js";
19+
20+
const { src, dest, watch, series, parallel } = gulp;
21+
const browserSync = BrowserSync.create();
22+
const nodepath = "node_modules/";
23+
const sass = gulpSass(sassCompiler);
2424

2525
//Note : Webp still not supported in major browsers including forefox
2626
//const webp = require('gulp-webp'); //For converting images to WebP format
2727
//const replace = require('gulp-replace'); //For Replacing img formats to webp in html
28-
const logSymbols = require('log-symbols'); //For Symbolic Console logs :) :P
2928

3029
//Load Previews on Browser on dev
3130
function livePreview(done) {
@@ -45,21 +44,6 @@ function setupBulma() {
4544
.pipe(dest('src/sass/'));
4645
}
4746

48-
//Compile Sass code
49-
function compileSASS() {
50-
console.log("\n\t" + logSymbols.info, "Compiling Bulma Sass..\n");
51-
return src(['src/sass/bulma.sass'])
52-
.pipe(sass({
53-
outputStyle: 'compressed',
54-
sourceComments: 'map',
55-
sourceMap: 'sass',
56-
includePaths: bourbon
57-
}).on('error', sass.logError))
58-
.pipe(autoprefixer('last 2 versions'))
59-
.pipe(dest('dist/assets/css'))
60-
.pipe(browserSync.stream());
61-
}
62-
6347
//Compile Scss code
6448
function compileSCSS() {
6549
console.log("\n\t" + logSymbols.info, "Compiling App SCSS..\n");
@@ -68,7 +52,7 @@ function compileSCSS() {
6852
outputStyle: 'compressed',
6953
sourceComments: 'map',
7054
sourceMap: 'scss',
71-
includePaths: bourbon
55+
includePaths: bourbon.includePaths
7256
}).on('error', sass.logError))
7357
.pipe(autoprefixer('last 2 versions'))
7458
.pipe(dest('dist/css'))
@@ -186,14 +170,17 @@ const buildTasks = [
186170
),
187171
]
188172

189-
exports.setup = series(setupBulma);
190-
191-
exports.build = series(
192-
...buildTasks,
193-
);
194-
195-
exports.default = exports.dev = series(
196-
...buildTasks,
197-
livePreview, // Live Preview Build
198-
watchFiles // Watch for Live Changes
199-
);
173+
export const build = (done) => {
174+
series(devClean, resetPages, parallel(...buildTasks, devImages))();
175+
done();
176+
};
177+
178+
export default (done) => {
179+
series(
180+
devClean,
181+
resetPages,
182+
parallel(...buildTasks),
183+
parallel(livePreview, watchFiles)
184+
)();
185+
done();
186+
};

0 commit comments

Comments
 (0)