allow apps to overwrite bootstrap variables

improves theming capabilities
innoq · Feb 11, 2015 · cc6e535 · cc6e535
1 parent c1c263f
commit cc6e535
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/app/assets/stylesheets/_framework.scss b/app/assets/stylesheets/_framework.scss
@@ -1,5 +1,3 @@
-@import 'iqvoc/settings/bootstrap-variables';
-
 @import 'bootstrap-sass/assets/stylesheets/bootstrap-sprockets';
 @import 'bootstrap-sass/assets/stylesheets/bootstrap';
 

diff --git a/app/assets/stylesheets/manifest.css.scss b/app/assets/stylesheets/manifest.css.scss
@@ -1,2 +1,3 @@
+@import 'iqvoc/settings/bootstrap-variables';
 @import 'framework';
 @import 'iqvoc/manifest';
diff --git a/lib/generators/app/template.rb b/lib/generators/app/template.rb
@@ -66,6 +66,7 @@ module #{namespaced_app_name}
 
 remove_file 'app/assets/stylesheets/application.css'
 create_file 'app/assets/stylesheets/manifest.css.scss', <<-EOF
+@import 'iqvoc/settings/bootstrap-variables';
 @import 'framework';
 @import 'iqvoc/manifest';
 @import '#{app_path}/manifest';

diff --git a/lib/iqvoc/version.rb b/lib/iqvoc/version.rb
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.8.2"
+  VERSION = "4.9.0"
 end