Merge pull request #2491 from jhawthorn/remove_bourbon

Remove bourbon from admin
solidusio · Jan 12, 2018 · 4745ded · 4745ded
2 parents a499f9a + 67d687b
commit 4745ded
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 17 deletions.
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_messages.scss b/backend/app/assets/stylesheets/spree/backend/components/_messages.scss
@@ -26,7 +26,10 @@
 }
 
 .flash-wrapper {
-  @include position(fixed, null 0 0 $width-sidebar);
+  position: fixed;
+  bottom: 0;
+  left: $width-sidebar;
+  right: 0;
   z-index: 1000;
 }
 

diff --git a/backend/app/assets/stylesheets/spree/backend/components/_navigation.scss b/backend/app/assets/stylesheets/spree/backend/components/_navigation.scss
@@ -123,15 +123,17 @@ nav.menu {
 
   .admin-subnav {
     background: $color-navbar-submenu-bg;
-    @include padding($padding-y-navbar - $padding-y-navbar-submenu null);
+    padding-top:    $padding-y-navbar - $padding-y-navbar-submenu;
+    padding-bottom: $padding-y-navbar - $padding-y-navbar-submenu;
 
     li {
       background: $color-navbar-submenu-bg;
     }
 
     a {
       color: $color-navbar-submenu;
-      @include padding($padding-y-navbar-submenu null);
+      padding-top:    $padding-y-navbar-submenu;
+      padding-bottom: $padding-y-navbar-submenu;
 
       &:hover {
         color: $color-navbar-submenu-active;

diff --git a/backend/app/assets/stylesheets/spree/backend/components/_tabs.scss b/backend/app/assets/stylesheets/spree/backend/components/_tabs.scss
@@ -88,7 +88,9 @@
   }
 
   ul {
-    @include position(absolute, calc(100% - 1px) 0 null null);
+    position: absolute;
+    top: calc(100% - 1px);
+    right: 0;
     z-index: 1;
   }
 }

diff --git a/backend/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss b/backend/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss
@@ -14,7 +14,8 @@
   }
 
   > * { // usually a <span> but we'll use an * just in case
-    @include padding(null 1rem);
+    padding-left: 1rem;
+    padding-right: 1rem;
     position: relative;
     background: $background;
     z-index: 1;

diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_style_guide.scss b/backend/app/assets/stylesheets/spree/backend/sections/_style_guide.scss
@@ -37,8 +37,10 @@
     text-transform: capitalize;
 
     > li {
-      @include margin(0.5rem null);
-      @include padding(0.75rem null);
+      margin-top: 0.5rem;
+      margin-bottom: 0.5rem;
+      padding-top: 0.75rem;
+      padding-bottom: 0.75rem;
 
       &:not(:first-of-type) {
         border-top: 1px solid $color-style-guide-nav-border;
@@ -67,7 +69,8 @@
   }
 
   &-section-header {
-    @include margin(7rem 0 3rem);
+    margin: 7rem 0 3rem;
+
     border-bottom: 1px solid $color-style-guide-section-border;
     font-size: 1.5rem;
     font-weight: bold;
@@ -77,7 +80,8 @@
 
     span {
       background: $body-bg;
-      @include padding(null 0.5em);
+      padding-left: 0.5em;
+      padding-right: 0.5em;
     }
 
     a {

diff --git a/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss b/backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss
@@ -35,7 +35,9 @@
     }
 
     i {
-      @include margin(null 4px 0 6px);
+      margin-right: 4px;
+      margin-bottom: 0;
+      margin-left: 6px;
     }
 
     .actions a {

diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_layout.scss b/backend/app/assets/stylesheets/spree/backend/shared/_layout.scss
@@ -9,16 +9,22 @@ body {
 }
 
 .admin-nav {
-  @include position(absolute, 0 null 0 0);
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
   width: $width-sidebar;
   @media print { display: none }
 }
 
 .content-wrapper {
-  @include padding(1rem $grid-gutter-width null);
+  padding-top: 1rem;
+  padding-left: $grid-gutter-width;
+  padding-right: $grid-gutter-width;
 
   &:not(.full-width) {
-    @include margin(null auto);
+    margin-left: auto;
+    margin-right: auto;
     max-width: map-get($container-max-widths, "xl");
   }
 }

diff --git a/backend/app/assets/stylesheets/spree/backend/spree_admin.scss b/backend/app/assets/stylesheets/spree/backend/spree_admin.scss
@@ -1,5 +1,3 @@
-@import 'bourbon';
-
 @import 'spree/backend/globals/functions';
 @import 'spree/backend/globals/deprecation';
 @import 'spree/backend/globals/variables_override';

diff --git a/backend/lib/spree/backend.rb b/backend/lib/spree/backend.rb
@@ -3,7 +3,6 @@
 require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'sass-rails'
-require 'bourbon'
 require 'handlebars_assets'
 require 'font-awesome-rails'
 require 'autoprefixer-rails'

diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'
-  s.add_dependency 'bourbon', '>= 4', '< 6'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
   s.add_dependency 'font-awesome-rails', '~> 4.0'