spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -1,83 +1,39 @@
-#main-sidebar {
-  position: fixed;
-  top: $navbar-height + 2px;
-  bottom: 0;
-  left: 0;
-  padding: 0;
-  z-index: 1000;
-  display: block;
-  overflow-x: hidden;
+.sidebar {
   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-  background-color: lighten($gray-lighter, 5);
-  border-right: 1px solid darken($gray-lighter, 5);
-
-  a {
-    -webkit-font-smoothing: antialiased;
-    -webkit-text-size-adjust: 100%;
-    -ms-text-size-adjust: 100%;
-    -webkit-font-feature-settings: "kern" 1;
-    -moz-font-feature-settings: "kern" 1;
+  background-color: $gray-100;
+  border-right: 1px solid $gray-200;
+  margin-top: 50px;
+  height: calc(100% - 50px);
+  z-index: 999;
+
+  a.sidebar-submenu-item:hover {
+    text-decoration: none;
+    background-color: $gray-200;
+    cursor: pointer
   }
 
   ul.nav-sidebar {
     > li {
-      border-bottom: 1px solid $gray-lighter;
-
       > a {
-        text-transform: uppercase;
-        letter-spacing: 1px;
-        font-size: 12px;
-        font-weight: 500;
-        padding: 15px;
-        color: $gray;
+        color: $gray-700;
 
-        .glyphicon {
-          font-size: 18px;
-          vertical-align: bottom;
-          padding-right: 5px;
+        &:hover,
+        &[aria-expanded="true"] {
+          text-decoration: none;
+          background-color: $gray-200;
         }
 
-        .glyphicon.pull-right {
-          font-size: 8px;
+        .icon-chevron-left,
+        .icon-chevron-down {
+          font-size: .5rem;
           line-height: 2;
-          color: $gray-light;
-          position: absolute;
-          right: 5px;
+          right: 1rem;
           top: 50%;
-          margin-top: -8px;
-        }
-      }
-    }
-  }
-
-  ul.nav.nav-pills {
-    background-color: white;
-    border-top: 1px solid $gray-lighter;
-
-    li {
-      a {
-        padding: 5px 15px;
-        font-size: 12px;
-
-        &:hover {
-          border-radius: 0;
-        }
-      }
-
-      &.selected {
-        a {
-          color: $brand-success
+          margin-top: -.5rem;
         }
       }
     }
   }
-
-  .spree-version {
-    position: absolute;
-    z-index: -1;
-    left: 15px;
-    bottom: 15px;
-  }
 }
 
 #wrapper.sidebar-minimized #main-sidebar {
@@ -86,7 +42,7 @@
 
   li {
     &:hover, &.menu-active {
-      background-color: $gray-lighter;
+      background-color: $gray-100;
     }
   }
 
@@ -110,7 +66,7 @@
     display: block !important;
     height: auto !important;
     position: fixed;
-    top: $navbar-height + 2px;
+    top: 50px;
     bottom: 0;
     left: 0;
     padding: 0;
@@ -121,9 +77,9 @@
     left: 50px;
     min-width: 180px;
     visibility: visible;
-    background-color: lighten($gray-lighter, 5);
+    background-color: $gray-100;
     border-top: none;
-    border-right: 1px solid darken($gray-lighter, 5);
+    border-right: 1px solid $gray-200;
     padding-top: 5px;
   }
 }

data/app/assets/stylesheets/spree/backend/components/_tables.scss

@@ -1,12 +1,14 @@
 table.table {
+  font-size: $font-size-sm;
+
   thead {
     th {
       text-transform: uppercase;
-      font-size: $font-size-base - 3px;
+      font-size: $small-font-size;
       padding-top: 14px;
       padding-bottom: 14px;
-      vertical-align: middle;
-      letter-spacing: 1px;
+      vertical-align: top;
+      border-top: 0;
 
       a {
         .glyphicon {
@@ -15,17 +17,20 @@ table.table {
       }
     }
   }
+
   tbody {
     tr {
       td {
         vertical-align: middle;
+
         .filterable {
-          font-size: 0.8em;
-          margin-left: 0.2em;
+          font-size: .8em;
+          margin-left: .2em;
           color: white; // hidden, but space is reserved for the icon
           cursor: pointer;
         }
       }
+
       &:hover td .filterable {
         color: #666;
       }
@@ -35,22 +40,58 @@ table.table {
 
 .table-active-filters {
   display: none;
-  margin: -0.5em 0 0.9em 0;
+  margin: -.5em 0 .9em;
 
-  .label {
+  .badge {
     display: inline-block;
-    margin-right: 0.5em;
-    margin-bottom: 0.5em;
-    font-size: 85%;
+    margin-right: .5em;
+    margin-bottom: .5em;
 
     &:hover {
-      opacity: 0.8;
+      opacity: .8;
     }
 
     span.icon {
-      margin: 0.3em 0 0 0.6em;
+      margin: .3em 0 0 .6em;
       font-size: 80%;
       cursor: pointer;
     }
   }
 }
+
+.card {
+  > .table,
+  .table-responsive > .table {
+  	border-right: 0;
+  	border-left: 0;
+    margin-bottom: 0;
+
+    &:last-child, &:last-of-type {
+			border-bottom: 0;
+		}
+
+  	td:first-child,
+		th:first-child {
+			border-left: 0;
+		}
+
+  	td:last-child,
+		th:last-child {
+			border-right: 0;
+		}
+
+  	tr:first-child td,
+		tr:first-child th {
+			border-top: 0;
+		}
+
+  	tr:last-child td {
+			border-bottom: 0;
+		}
+	}
+
+  .card-header + .table,
+  .card-header + .table-responsive > .table {
+    border-top: 0;
+	}
+}

data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss

@@ -21,7 +21,7 @@
         position: absolute;
         top: 14px;
         left: 16px;
-        color: $gray;
+        color: $gray-500;
         cursor: move;
       }
       .btn-group {
@@ -59,7 +59,7 @@
           font-weight: bold;
         }
         div.price {
-          color: $gray;
+          color: $gray-500;
         }
       }
       &:hover {

data/app/assets/stylesheets/spree/backend/global/_variables.scss

@@ -1,25 +1,22 @@
 /*------------------------------------------
   Colors
   -----------------------------------------*/
-  $brand-primary: #478DC1;
-  $brand-success: #7DB942;
-  $brand-info:    #48B0F7;
-  $brand-warning: #F8D053;
-  $brand-danger:  #F55753;
+  $primary: darken(#478DC1, 10);
+  $success: darken(#7DB942, 2);
+  $info:    #48B0F7;
+  $warning: #F8D053;
+  $danger:  #F55753;
 
-  $input-border:  darken(#EDEDED, 5);
+  $input-border-color:  darken(#EDEDED, 5);
 
 /*------------------------------------------
   Components
   -----------------------------------------*/
-  $border-radius-base: 2px;
-  $padding-base-vertical: 8px;
-  $padding-base-horizontal: 16px;
+  $border-radius: 2px;
 
 /*------------------------------------------
   Fonts
   -----------------------------------------*/
-  $headings-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   $headings-font-weight: 300;
 
 /*------------------------------------------
@@ -29,9 +26,9 @@
 /*------------------------------------------
   Navbar
   -----------------------------------------*/
-  $navbar-inverse-bg: darken($brand-primary, 35);
+  $navbar-inverse-bg: darken($primary, 15);
 
 /*------------------------------------------
-  Wells
+  Forms
   -----------------------------------------*/
-  $well-bg: #fbfbfb;
+  $label-margin-bottom: 0;

data/app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss

@@ -1,19 +1,19 @@
 .ui-widget {
   font-family: $headings-font-family;
-  font-size: $font-size-base - 1;
+  font-size: $font-size-base;
   font-weight: 400;
 }
 
 #ui-datepicker-div {
   background-color: white;
   background-image: none;
-  color: $gray;
-  border-color: $input-border;
+  color: $gray-500;
+  border-color: $input-border-color;
   width: auto;
   padding: 20px;
 
   &.ui-corner-all {
-    border-radius: $border-radius-base;
+    border-radius: $border-radius;
   }
 
   .ui-datepicker-header {
@@ -28,8 +28,8 @@
     background-image: none;
     text-indent: 0;
     vertical-align: bottom !important;
-    width: 12px;
-    color: $brand-primary;
+    width: 14px;
+    color: $primary;
 
     &.ui-icon-circle-triangle-w {
       @extend .glyphicon;
@@ -48,23 +48,25 @@
     background-color: transparent;
     transition: color 0.2s ease-in-out;
     cursor: pointer;
-    
+
     span.ui-icon {
-      color: $brand-success;
+      color: $success;
     }
   }
 
   .ui-datepicker-next-hover {
-    right: 2;
+    right: 2px;
+    top: 2px;
   }
 
   .ui-datepicker-prev-hover {
-    left: 2;
+    left: 2px;
+    top: 2px;
   }
 
   .ui-datepicker-title {
     font-weight: 500;
-    color: $gray;
+    color: $gray-500;
   }
 
   table.ui-datepicker-calendar {
@@ -72,7 +74,7 @@
       span {
         text-transform: uppercase;
         letter-spacing: 1px;
-        color: $brand-primary;
+        color: $primary;
         font-weight: 500;
       }
     }
@@ -80,10 +82,10 @@
     td {
       width: 31px;
       height: 29px;
-      transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
+      // transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
 
-      .ui-state-default, 
-      .ui-widget-content .ui-state-default, 
+      .ui-state-default,
+      .ui-widget-content .ui-state-default,
       .ui-widget-header .ui-state-default {
         background-color: transparent;
         background-image: none;
@@ -92,18 +94,29 @@
         font-weight: 300;
       }
 
+      .ui-state-highlight {
+        @include button-variant($secondary, $secondary);
+      }
+
+      .ui-state-active {
+        @include button-variant($success, $success);
+
+        &:hover {
+          background-color: darken($success, 7);
+        }
+      }
+
       &:hover {
-        background-color: $gray-lighter;
+        background-color: $gray-100;
       }
 
       &:active {
-        background-color: $brand-success;
+        background-color: $success;
 
         a {
-          color: white;  
-        }        
+          color: white;
+        }
       }
     }
   }
 }
-

data/app/assets/stylesheets/spree/backend/plugins/_select2.scss

@@ -2,14 +2,15 @@
   display: block;
 
   .select2-choice {
-    height: $input-height-base;
+    height: $input-height;
     line-height: 2.2;
-    border-color: $input-border;
+    border-color: $input-border-color;
     background-image: none;
     background-color: $input-bg;
 
-    &, .select2-arrow {
-      border-radius: $border-radius-base;
+    &,
+    .select2-arrow {
+      border-radius: $border-radius;
     }
 
     .select2-arrow {
@@ -17,7 +18,7 @@
       background-color: $input-bg;
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
-      border-left-color: $input-border;
+      border-left-color: $input-border-color;
 
       b {
         background-position: 0 7px;
@@ -37,13 +38,14 @@
 }
 
 .select2-search input {
-  border-color: $input-border;
-  border-radius: $border-radius-base;
+  border-color: $input-border-color;
+  border-radius: $border-radius;
+  background-image: none;
 }
 
 .select2-drop {
   &, &.select2-drop-above {
-    border-radius: $border-radius-base;
+    border-radius: $border-radius;
     box-shadow: none;
   }
 }
@@ -54,13 +56,13 @@
   }
 }
 
-.select2-dropdown-open.select2-drop-above .select2-choice, 
+.select2-dropdown-open.select2-drop-above .select2-choice,
 .select2-dropdown-open.select2-drop-above .select2-choices {
   background-image: none;
 }
 
 .select2-dropdown-open.select2-drop-above .select2-choice {
-  border-radius: 0 0 $border-radius-base $border-radius-base;
+  border-radius: 0 0 $border-radius $border-radius;
 }
 
 .select2-drop-above,
@@ -68,15 +70,15 @@
 .select2-dropdown-open .select2-choice,
 .select2-drop.select2-drop-above.select2-drop-active,
 .select2-drop.select2-drop-active {
-  border-color: lighten($brand-success, 20);
+  border-color: lighten($success, 20);
 }
 
 .select2-result-label {
-  color: $gray;
+  color: $gray-900;
 }
 
 .select2-results .select2-highlighted {
-  background-color: $brand-primary;
+  background-color: $primary;
 
   .select2-result-label {
     color: white;
@@ -86,13 +88,16 @@
 .select2-container-multi {
   .select2-choices {
     line-height: 1.8;
-    border-color: $input-border;
+    border-color: $input-border-color;
     background-image: none;
     background-color: $input-bg;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
 
     .select2-search-choice {
-      @extend .label;
-      @extend .label-info;
+      @extend .badge;
+      @extend .badge-info;
 
       box-shadow: none;
       border: none;
@@ -121,7 +126,7 @@
   &.select2-container-active {
     .select2-choices {
       box-shadow: none;
-      border-color: lighten($brand-success, 20);
+      border-color: lighten($success, 20);
     }
   }
-}
+}