diff --git a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee index 2563d0f74a..aa9fd0595f 100644 --- a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee @@ -1,3 +1,3 @@ window.SidebarCtrl = Darkswarm.controller "SidebarCtrl", ($scope, $location) -> $scope.active = -> - $location.path() == "/login" || $location.path() == "/signup" + $location.path() in ["/login", "/signup"] diff --git a/app/assets/stylesheets/darkswarm/sidebar.css.sass b/app/assets/stylesheets/darkswarm/sidebar.css.sass index 8ae8d371bc..2d2523320e 100644 --- a/app/assets/stylesheets/darkswarm/sidebar.css.sass +++ b/app/assets/stylesheets/darkswarm/sidebar.css.sass @@ -2,17 +2,16 @@ // We can't import foundation components? // See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252 -//@import "foundation/variables" - -//@import "foundation/components/global" -//@import "foundation/components/buttons" -//@import "foundation/components/panels" +@import "variables" +@import "components/global" +@import "components/buttons" +@import "components/panels" -//#sidebar - //margin-top: 1.875em - //$bg: #222 - //$padding: emCalc(20) - //$adjust: true - //$adjust: true - //@include panel($bg, $padding, $adjust) +#sidebar + margin-top: 1.875em + $bg: #222 + $padding: emCalc(20) + $adjust: true + $adjust: true + @include panel($bg, $padding, $adjust) diff --git a/config/application.rb b/config/application.rb index 49936d7baf..8f0728dd45 100644 --- a/config/application.rb +++ b/config/application.rb @@ -75,6 +75,11 @@ module Openfoodnetwork # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' + config.sass.load_paths += [ + "#{Gem.loaded_specs['foundation-rails'].full_gem_path}/vendor/assets/stylesheets/foundation/components", + "#{Gem.loaded_specs['foundation-rails'].full_gem_path}/vendor/assets/stylesheets/foundation/" + ] + # css and js files other than application.* are not precompiled by default # Instead, they must be explicitly included below # http://stackoverflow.com/questions/8012434/what-is-the-purpose-of-config-assets-precompile @@ -85,5 +90,6 @@ module Openfoodnetwork config.assets.precompile += ['comfortable_mexican_sofa/*'] config.assets.precompile += ['search/all.css', 'search/*.js'] config.assets.precompile += ['shared/*'] + end end