Some css fixes to make it all work in rails 5

openfoodfoundation · Jan 15, 2021 · 7c90241 · 7c90241
1 parent f179214
commit 7c90241
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/assets/stylesheets/darkswarm/sidebar.scss b/app/assets/stylesheets/darkswarm/sidebar.scss
@@ -3,9 +3,9 @@
 // See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252
 
 @import "variables";
-@import "components/global";
-@import "components/buttons";
-@import "components/panels";
+@import "foundation/components/global";
+@import "foundation/components/buttons";
+@import "foundation/components/panels";
 
 #sidebar {
   margin-top: 1.875em;

diff --git a/config/initializers/compass.rb b/config/initializers/compass.rb
@@ -0,0 +1,2 @@
+require 'compass'
+Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory
diff --git a/lib/spree/i18n.rb b/lib/spree/i18n.rb
@@ -6,6 +6,7 @@
 
 module Spree
   extend ActionView::Helpers::TranslationHelper
+  extend ActionView::Helpers::TagHelper if ENV['DEPENDENCIES_NEXT']
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		require 'compass'
		Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory