diff options
| -rw-r--r-- | config.rb | 16 | ||||
| -rw-r--r-- | source/javascripts/all.js | 5 | ||||
| -rw-r--r-- | source/javascripts/modernizr.js | 1 | ||||
| -rw-r--r-- | source/layouts/layout.haml | 2 | ||||
| -rw-r--r-- | source/stylesheets/base.css.scss | 5 |
5 files changed, 18 insertions, 11 deletions
@@ -53,10 +53,12 @@ end # Compass ### -# Change Compass configuration -# compass_config do |config| -# config.output_style = :compact -# end +compass_config do |config| + # Require any additional compass plugins here. + config.add_import_path "bower_components/foundation/scss" + + config.output_style = :compact +end ### # Page options, layouts, aliases and proxies @@ -104,6 +106,12 @@ set :images_dir, 'images' set :relative_links, true +# Add bower's directory to sprockets asset path +after_configuration do + @bower_config = JSON.parse(IO.read("#{root}/.bowerrc")) + sprockets.append_path File.join "#{root}", @bower_config["directory"] +end + # Build-specific configuration configure :build do # For example, change the Compass output style for deployment diff --git a/source/javascripts/all.js b/source/javascripts/all.js index a20886a..f255da4 100644 --- a/source/javascripts/all.js +++ b/source/javascripts/all.js @@ -1,3 +1,2 @@ -//= require jquery -//= require bootstrap -//= require_tree . +//= require jquery/dist/jquery +//= require foundation/js/foundation.min diff --git a/source/javascripts/modernizr.js b/source/javascripts/modernizr.js new file mode 100644 index 0000000..d03ca80 --- /dev/null +++ b/source/javascripts/modernizr.js @@ -0,0 +1 @@ +//= require modernizr/modernizr diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml index 53cf1ae..d932c9b 100644 --- a/source/layouts/layout.haml +++ b/source/layouts/layout.haml @@ -9,7 +9,7 @@ / Use title if it's in the page YAML frontmatter %title= current_page.data.title || "sublab" = stylesheet_link_tag "base" - = javascript_include_tag "all" + = javascript_include_tag "modernizr", "all" %body{:class => page_classes} / header %header diff --git a/source/stylesheets/base.css.scss b/source/stylesheets/base.css.scss index b360df7..bcef650 100644 --- a/source/stylesheets/base.css.scss +++ b/source/stylesheets/base.css.scss @@ -1,4 +1,3 @@ -// TODO -body { -} +@import "normalize.scss"; +@import "foundation.scss"; |