From 8ab9757ef80820b66a416e336a563019fa27ab5f Mon Sep 17 00:00:00 2001 From: koenemann Date: Tue, 15 Sep 2015 15:51:19 +0200 Subject: [PATCH] resorting sass dependencies --- gulpfile.js | 4 ++ sass/bootstrap-sass/_bootstrap-compass.scss | 9 +++ sass/bootstrap-sass/_bootstrap-mincer.scss | 19 +++++++ sass/bootstrap-sass/_bootstrap-sprockets.scss | 9 +++ sass/bootstrap-sass/_bootstrap.scss | 56 +++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 sass/bootstrap-sass/_bootstrap-compass.scss create mode 100644 sass/bootstrap-sass/_bootstrap-mincer.scss create mode 100644 sass/bootstrap-sass/_bootstrap-sprockets.scss create mode 100644 sass/bootstrap-sass/_bootstrap.scss diff --git a/gulpfile.js b/gulpfile.js index e5f0e90..6ccebc6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -48,10 +48,14 @@ gulp.task('cleancss', function() { gulp.task('copy-assets', function() { gulp.src(basePaths.bower + 'bootstrap-sass/assets/javascripts/*.js') .pipe(gulp.dest('./js')); + gulp.src(basePaths.bower + 'bootstrap-sass/assets/stylesheets/*.scss') + .pipe(gulp.dest('./sass/bootstrap-sass')); gulp.src(basePaths.bower + 'bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,eof,svg}') .pipe(gulp.dest('./fonts')); gulp.src(basePaths.bower + 'fontawesome/fonts/**/*.{ttf,woff,eof,svg}') .pipe(gulp.dest('./fonts')); + gulp.src(basePaths.bower + 'fontawesome/scss/*.scss') + .pipe(gulp.dest('./sass/fontawesome')); gulp.src(basePaths.bower + 'jquery/dist/*.js') .pipe(gulp.dest('./js')); gulp.src(basePaths.bower + '_s/js/*.js') diff --git a/sass/bootstrap-sass/_bootstrap-compass.scss b/sass/bootstrap-sass/_bootstrap-compass.scss new file mode 100644 index 0000000..8fbc3cd --- /dev/null +++ b/sass/bootstrap-sass/_bootstrap-compass.scss @@ -0,0 +1,9 @@ +@function twbs-font-path($path) { + @return font-url($path, true); +} + +@function twbs-image-path($path) { + @return image-url($path, true); +} + +$bootstrap-sass-asset-helper: true; diff --git a/sass/bootstrap-sass/_bootstrap-mincer.scss b/sass/bootstrap-sass/_bootstrap-mincer.scss new file mode 100644 index 0000000..7ec4657 --- /dev/null +++ b/sass/bootstrap-sass/_bootstrap-mincer.scss @@ -0,0 +1,19 @@ +// Mincer asset helper functions +// +// This must be imported into a .css.ejs.scss file. +// Then, <% %>-interpolations will be parsed as strings by Sass, and evaluated by EJS after Sass compilation. + + +@function twbs-font-path($path) { + // do something like following + // from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>" + // from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>" + // or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>" + @return "<%- asset_path('#{$path}'.replace(/[#?].*$/, '')) + '#{$path}'.replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>"; +} + +@function twbs-image-path($file) { + @return "<%- asset_path('#{$file}') %>"; +} + +$bootstrap-sass-asset-helper: true; diff --git a/sass/bootstrap-sass/_bootstrap-sprockets.scss b/sass/bootstrap-sass/_bootstrap-sprockets.scss new file mode 100644 index 0000000..9fffc1e --- /dev/null +++ b/sass/bootstrap-sass/_bootstrap-sprockets.scss @@ -0,0 +1,9 @@ +@function twbs-font-path($path) { + @return font-path($path); +} + +@function twbs-image-path($path) { + @return image-path($path); +} + +$bootstrap-sass-asset-helper: true; diff --git a/sass/bootstrap-sass/_bootstrap.scss b/sass/bootstrap-sass/_bootstrap.scss new file mode 100644 index 0000000..598b007 --- /dev/null +++ b/sass/bootstrap-sass/_bootstrap.scss @@ -0,0 +1,56 @@ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +// Core variables and mixins +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +// Reset and dependencies +@import "bootstrap/normalize"; +@import "bootstrap/print"; +@import "bootstrap/glyphicons"; + +// Core CSS +@import "bootstrap/scaffolding"; +@import "bootstrap/type"; +@import "bootstrap/code"; +@import "bootstrap/grid"; +@import "bootstrap/tables"; +@import "bootstrap/forms"; +@import "bootstrap/buttons"; + +// Components +@import "bootstrap/component-animations"; +@import "bootstrap/dropdowns"; +@import "bootstrap/button-groups"; +@import "bootstrap/input-groups"; +@import "bootstrap/navs"; +@import "bootstrap/navbar"; +@import "bootstrap/breadcrumbs"; +@import "bootstrap/pagination"; +@import "bootstrap/pager"; +@import "bootstrap/labels"; +@import "bootstrap/badges"; +@import "bootstrap/jumbotron"; +@import "bootstrap/thumbnails"; +@import "bootstrap/alerts"; +@import "bootstrap/progress-bars"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/panels"; +@import "bootstrap/responsive-embed"; +@import "bootstrap/wells"; +@import "bootstrap/close"; + +// Components w/ JavaScript +@import "bootstrap/modals"; +@import "bootstrap/tooltip"; +@import "bootstrap/popovers"; +@import "bootstrap/carousel"; + +// Utility classes +@import "bootstrap/utilities"; +@import "bootstrap/responsive-utilities";