steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Initiate sass-based app style system.

This commit is contained in:
Christopher Charbonneau Wells 2017-08-21 10:43:13 -04:00
parent f3fc219980
commit 3d0af7f9a5
5 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
babyblotter/static_site/scss/_custom.scss Normal file
View File

@ -0,0 +1 @@
$body-bg: $white;

4
babyblotter/static_site/scss/babyblotter.scss Normal file
View File

@ -0,0 +1,4 @@
@import "../../../node_modules/bootstrap/scss/functions";
@import "../../../node_modules/bootstrap/scss/variables";
@import "custom";
@import "../../../node_modules/bootstrap/scss/bootstrap";

1
babyblotter/templates/babyblotter/base.html
View File

@ -7,6 +7,7 @@
<meta name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{% block title %}{% endblock %} | Baby Blotter</title>
<link rel="stylesheet" href="{% static "babyblotter/css/app.min.css" %}" />
<link rel="stylesheet" href="{% static "babyblotter/css/vendor.min.css" %}" />
</head>
<body style="padding-top: 5rem;">

36
gulpfile.js
View File

@ -1,8 +1,9 @@
var gulp = require('gulp');
var pump = require('pump');
var concat = require('gulp-concat');
var csso = require('gulp-csso');
var pump = require('pump');
var sass = require('gulp-sass');
var uglify = require('gulp-uglify');
/* APP FILES */
@ -18,7 +19,18 @@ gulp.task('app:scripts', function() {
.pipe(gulp.dest('babyblotter/static/babyblotter/js/'));
});
gulp.task('app', ['app:scripts']);
gulp.task('app:styles', function (cb) {
pump([
gulp.src('babyblotter/static_site/scss/babyblotter.scss'),
sass().on('error', sass.logError),
concat('app.css'),
gulp.dest('babyblotter/static/babyblotter/css/')
],
cb
);
});
gulp.task('app', ['app:scripts', 'app:styles']);
/* VENDOR FILES */
@ -36,7 +48,7 @@ gulp.task('vendor:scripts', function() {
gulp.task('vendor:styles', function() {
return gulp.src([
'node_modules/bootstrap/dist/css/bootstrap.css',
//'node_modules/bootstrap/dist/css/bootstrap.css',
'node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css',
'node_modules/font-awesome/css/font-awesome.css'
])
@ -66,6 +78,17 @@ gulp.task('compress:app:scripts', function (cb) {
);
});
gulp.task('compress:app:styles', function (cb) {
pump([
gulp.src('babyblotter/static/babyblotter/css/app.css'),
concat('app.min.css'),
csso(),
gulp.dest('babyblotter/static/babyblotter/css/')
],
cb
);
});
gulp.task('compress:vendor:scripts', function (cb) {
pump([
gulp.src('babyblotter/static/babyblotter/js/vendor.js'),
@ -77,7 +100,7 @@ gulp.task('compress:vendor:scripts', function (cb) {
);
});
gulp.task('compress:vendor:css', function (cb) {
gulp.task('compress:vendor:styles', function (cb) {
pump([
gulp.src('babyblotter/static/babyblotter/css/vendor.css'),
concat('vendor.min.css'),
@ -90,10 +113,11 @@ gulp.task('compress:vendor:css', function (cb) {
gulp.task('compress', [
'compress:app:scripts',
'compress:app:styles',
'compress:vendor:scripts',
'compress:vendor:css'
'compress:vendor:styles'
]);
/* DEFAULT */
gulp.task('default', ['vendor', 'app', 'compress']);
gulp.task('default', ['vendor', 'app']);

1
package.json
View File

@ -8,6 +8,7 @@
"gulp": "^3.9.1",
"gulp-concat": "^2.6.1",
"gulp-csso": "^3.0.0",
"gulp-sass": "^3.1.0",
"gulp-uglify": "^3.0.0",
"jquery": "^3.2.1",
"moment": "^2.18.1",