From 7c9024101b9ae22c3e34cea8a7a00eccab5d758c Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 15 Jan 2021 23:26:19 +0000 Subject: [PATCH] Some css fixes to make it all work in rails 5 --- app/assets/stylesheets/darkswarm/sidebar.scss | 6 +++--- config/initializers/compass.rb | 2 ++ lib/spree/i18n.rb | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 config/initializers/compass.rb diff --git a/app/assets/stylesheets/darkswarm/sidebar.scss b/app/assets/stylesheets/darkswarm/sidebar.scss index 18718062dad..2e6a7d0a2e2 100644 --- 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 new file mode 100644 index 00000000000..ea537f03907 --- /dev/null +++ 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 index 7780bc3ad77..39bd4590cd0 100644 --- 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