diff options
| author | Jan Stevens <jan@playpass.be> | 2015-08-25 17:52:58 +0300 |
|---|---|---|
| committer | Jan Stevens <jan@playpass.be> | 2015-08-25 17:52:58 +0300 |
| commit | d4c7c325eca7e60bc2dc2b300d75319f052086fe (patch) | |
| tree | 713d935afdf6af6d184a6990b47a65363aa7b1d9 /templates | |
| parent | a3f606b2c2daeceef765c2843364f1a04a1b43ae (diff) | |
Updated to latest v4-dev build and fixed some leftover stuff
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/project/_bootstrap-variables.sass | 2 | ||||
| -rw-r--r-- | templates/project/manifest.rb | 2 | ||||
| -rw-r--r-- | templates/project/styles.sass | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index 371c285..24ee9a8 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -180,7 +180,7 @@ // // Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -// $line-height-lg: (4/3); +// $line-height-lg: (4 / 3); // $line-height-sm: 1.5; // $border-radius: .25rem; diff --git a/templates/project/manifest.rb b/templates/project/manifest.rb index 9f4468f..43f6e62 100644 --- a/templates/project/manifest.rb +++ b/templates/project/manifest.rb @@ -6,7 +6,7 @@ stylesheet 'styles.sass' # Bootstrap variable overrides file stylesheet '_bootstrap-variables.sass', :to => '_bootstrap-variables.sass' -# Copy JS and fonts +# Copy JS manifest = Pathname.new(File.dirname(__FILE__)) assets = File.expand_path('../../assets', manifest) {:javascript => 'javascripts'}.each do |method, dir| diff --git a/templates/project/styles.sass b/templates/project/styles.sass index 04371d1..0dcb8ab 100644 --- a/templates/project/styles.sass +++ b/templates/project/styles.sass @@ -3,8 +3,8 @@ // Import Bootstrap for Sass @import "bootstrap" // or Import Bootstrap Flex -@import "bootstrap-flex" +//@import "bootstrap-flex" // or Import Bootstrap Grid -@import "bootstrap-grid" +//@import "bootstrap-grid" // or Import Bootstrap Reboot -@import "bootstrap-reboot" +//@import "bootstrap-reboot" |