Remove Legacy Admin Layout

CHANGELOG.md

@@ -7,6 +7,8 @@
 
 - The all configuration objects now use static preferences by default. It's no longer necessary to call `use_static_preferences!`, as that is the new default. For the old behaviour of loading preferences from the DB, call `config.use_legacy_db_preferences!`. [\#2112](https://github.com/solidusio/solidus/pull/2112) ([jhawthorn](https://github.com/jhawthorn))
 
+- Remove Skeleton Grid CSS from the admin and complete its transition to Bootstrap. [\#2127](https://github.com/solidusio/solidus/pull/2127) ([graygilmore](https://github.com/graygilmore))
+
 ## Solidus 2.3.0 (unreleased)
 
 - Rails 5.1 [\#1895](https://github.com/solidusio/solidus/pull/1895) ([jhawthorn](https://github.com/jhawthorn))

backend/app/assets/stylesheets/spree/backend/components/_sidebar.scss

@@ -1,43 +1,18 @@
-body:not(.new-layout) #sidebar {
-  overflow: visible;
-  margin-top: 1.5rem;
+.content-sidebar {
+  padding-top: 0.65rem;
 
-  .sidebar-title {
-    color: $color-2;
-    text-align: center;
-    font-size: 16px;
-    font-weight: $font-weight-bold;
-    border-top: 1px solid $color-border;
-
-    > span {
-      display: inline;
-      background: #fff;
-      padding: 5px 10px;
-      position: relative;
-      top: -14px;
-
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-    }
-  }
-
-  dl {
-    dt, dd {
-      min-height: 3em;
-    }
+  .has-tabs & {
+    padding-top: 3.25rem;
   }
 
-  @media print { display: none }
-}
-
-body.new-layout .content-sidebar {
   ul {
     padding-left: 0;
   }
 }
 
-body.new-layout .sidebar-title {
-  @include line-through();
+.sidebar-title {
+  @include line-through($color: $color-border);
   color: $color-2;
   font-size: 14px;
+  font-weight: $font-weight-normal;
 }

backend/app/assets/stylesheets/spree/backend/sections/_style_guide.scss

@@ -1,4 +1,5 @@
 .style-guide {
+  padding-left: 0; // override regular admin layout
   display: flex;
 
   &-sidebar {

backend/app/assets/stylesheets/spree/backend/shared/_header.scss

@@ -6,10 +6,6 @@
   border-bottom: 1px solid $color-border;
   height: $main-header-height;
 
-  body:not(.new-layout) & {
-    margin-left: $width-sidebar;
-  }
-
   @media print { display: none }
 }
 

backend/app/assets/stylesheets/spree/backend/shared/_layout.scss

@@ -5,10 +5,7 @@ html {
 body {
   position: relative;
   min-height: 100%;
-
-  &.new-layout {
-    padding-left: $width-sidebar;
-  }
+  padding-left: $width-sidebar;
 }
 
 .admin-nav {
@@ -18,32 +15,16 @@ body {
 }
 
 .content-wrapper {
-  body:not(.new-layout) & {
-    margin-left: $width-sidebar;
-    @media print { margin-left: 0 }
-  }
-
-  body.new-layout & {
-    @include padding(1rem map-get($grid-gutter-widths, "xl") null);
-  }
+  @include padding(1rem map-get($grid-gutter-widths, "xl") null);
 
-  &.centered {
+  &:not(.full-width) {
     @include margin(null auto);
     max-width: map-get($container-max-widths, "xl");
   }
 }
 
 .content-main {
-  @include make-col(12);
   overflow-x: hidden; // makes sure that the tabs are able to resize
-
-  .has-sidebar & {
-    @include make-col(9);
-  }
-}
-
-.content-sidebar {
-  @include make-col(3);
 }
 
 #content {

backend/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -10,7 +10,6 @@
 
 @import 'spree/backend/globals/mixins';
 
-@import 'spree/backend/shared/skeleton';
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/images';
 @import 'spree/backend/shared/tables';

backend/app/views/spree/admin/promotions/rules/_user_role.html.erb

@@ -1,11 +1,11 @@
-<div class="field alpha omega eight columns">
+<div class="form-group">
   <%= label_tag "#{param_prefix}_preferred_role_ids", Spree.t('user_role_rule.choose_roles') %>
   <%= select_tag "#{param_prefix}[preferred_role_ids]",
     options_from_collection_for_select(
       Spree::Role.all, :id, :name, promotion_rule.preferred_role_ids
     ), class: 'custom-select fullwidth', multiple: true %>
 </div>
-<div class="field alpha omega eight columns">
+<div class="form-group">
   <label>
     <%= Spree.t('user_role_rule.label', select: select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::UserRole::MATCH_POLICIES.map{ |s| [Spree.t("user_role_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), { class: 'custom-select'})).html_safe %>
   </label>

backend/app/views/spree/admin/stock_transfers/tracking_info.html.erb

@@ -25,7 +25,7 @@
 <fieldset>
   <legend align='center'><%= Spree.t(:tracking_info) %></legend>
     <%= form_for [:admin, @stock_transfer] do |f| %>
-    <div class='field-block alpha'>
+    <div class='field-block'>
       <div class='field'>
         <%= f.label :tracking_number %>
         <%= f.text_field :tracking_number, value: @stock_transfer.tracking_number, maxlength: 255, size: 0, class: 'fullwidth' %>