solidus_backend 2.1.1 → 2.2.0.beta1

data/app/assets/stylesheets/spree/backend/components/_date-picker.scss

@@ -1,9 +1,6 @@
 .date-range-filter {
   .range-divider {
-    padding: 0;
-  }
-  input.datepicker {
-    width: 96px !important;
+    color: $gray;
   }
 }
 
@@ -12,6 +9,7 @@
   border-radius: $border-radius;
   padding: 0;
   margin-top: 10px;
+  width: auto;
 
   &:before {
     content: '';
@@ -54,7 +52,7 @@
         background-image: none;
         text-indent: 0;
         color: $color-1;
-        width: 10px;
+        width: 13px;
         margin-left: -5px;
 
         &:hover {
@@ -98,7 +96,7 @@
       th {
         border-bottom: 1px solid $color-border;
         border-right: 1px solid $color-border;
-        color: $color-body-text;
+        color: $body-color;
         width: 33px;
 
         &:last-child {
@@ -121,7 +119,7 @@
           background-color: $color-1;
           background-image: none;
           font-size: 85%;
-          color: $color-body-text;
+          color: $body-color;
 
           &.ui-state-active {
             background-color: $color-2;

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

@@ -0,0 +1,24 @@
+.image-placeholder {
+  &.mini {
+    width: 50px;
+    height: 50px;
+    line-height: 48px;
+  }
+
+  &.small {
+    width: 102px;
+    height: 102px;
+    line-height: 100px;
+  }
+
+  display: inline-block;
+  margin: auto;
+  text-align: center;
+  border: 1px solid #ddd;
+  color: #aaa;
+
+  &:before {
+    font: normal normal normal 14px/1 FontAwesome;
+    content: "\f03e"; /* fa-picture-o */
+  }
+}

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

@@ -1,14 +1,14 @@
 .errorExplanation {
   padding: 5px;
-  border: 1px solid very-light($color-error, 12);
-  background-color: very-light($color-error, 6);
+  border: 1px solid very-light($brand-danger, 12);
+  background-color: very-light($brand-danger, 6);
   border-radius: 3px;
-  color: very-light($color-error, 30);
+  color: very-light($brand-danger, 30);
   margin-bottom: 15px;
 
   h2 {
     font-size: 140%;
-    color: very-light($color-error, 30);
+    color: very-light($brand-danger, 30);
     margin-bottom: 5px;
   }
 
@@ -37,9 +37,9 @@
   color: $color-1;
   font-weight: $font-weight-bold;
 
-  &.notice  { background-color: rgba($color-notice,  0.8) }
-  &.success { background-color: rgba($color-success, 0.8) }
-  &.error   { background-color: rgba($color-error,   0.8) }
+  &.notice  { background-color: rgba($brand-warning,  0.8) }
+  &.success { background-color: rgba($brand-success, 0.8) }
+  &.error   { background-color: rgba($brand-danger,   0.8) }
 }
 
 .alert {
@@ -50,5 +50,5 @@
     text-decoration: underline;
   }
 
-  &.error a { color: very-light($color-error, 10) }
+  &.error a { color: very-light($brand-danger, 10) }
 }

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

@@ -14,7 +14,6 @@ nav.menu {
         text-align: left;
         border: 1px solid transparent;
         font-weight: $font-weight-bold;
-        font-size: 90%;
       }
 
       &.active a {
@@ -33,20 +32,12 @@ nav.menu {
 }
 
 .admin-nav-header {
-  padding: 15px;
-  height: 58px; // height of .page-title
-  box-sizing: content-box;
   background-color: $color-1;
   border-bottom: 1px solid $color-border;
-
-  a {
-    display: inline-block;
-    line-height: 58px;
-  }
-
-  img {
-    vertical-align: middle;
-  }
+  text-align: center;
+  // Using line height for proper vertical centering.
+  // As line height does not take the border width into account we need to subtract it.
+  line-height: $main-header-height - 1px;
 }
 
 .admin-nav-menu {
@@ -119,13 +110,13 @@ nav.menu {
     &:before {
       position: absolute;
       left: 1em;
-      @include transform(translateX(-50%));
+      transform: translateX(-50%);
     }
   }
 
   // until .fa usage is corrected
   .text {
-    font-family: $base-font-family;
+    font-family: $font-family-base;
     -webkit-font-smoothing: auto;
     -moz-osx-font-smoothing: auto;
   }

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

@@ -0,0 +1,39 @@
+.number-with-currency {
+  &-symbol {
+    min-width: 2.5em;
+  }
+
+  &-amount {
+    text-align: right;
+  }
+
+  &-addon {
+    width: 5.5rem;
+    text-align: left;
+  }
+
+  &-with-select {
+    .number-with-currency-amount {
+      border-right: 0;
+
+      &:focus + .number-with-currency-select {
+        border-left-color: $input-border-focus;
+      }
+    }
+
+    .number-with-currency-select {
+      @extend .custom-select;
+
+      cursor: pointer;
+      width: 5.5rem;
+
+      @include border-radius($border-radius);
+      @include border-left-radius(0);
+
+      &::-ms-expand {
+        // Required to see full text of selected value on IE11
+        display: none;
+      }
+    }
+  }
+}

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

@@ -6,7 +6,7 @@
   bottom: 0;
   z-index: 1000;
   opacity: 0.8;
-  @include calc(width, "100% - #{$width-sidebar}");
+  width: calc(100% - #{$width-sidebar});
 
   .wrapper {
     border-radius: 10px;
@@ -40,15 +40,15 @@
   height: 30px;
   border: 6px solid rgba($color-spinner, 0.2);
   border-left-color: rgba($color-spinner, 1);
-  @include animation(spinner 1s infinite linear);
+  animation: spinner 1s infinite linear;
   border-radius: 50%;
 }
 
-@include keyframes(spinner) {
+@keyframes spinner {
   from {
-    @include transform(rotate(0));
+    transform: rotate(0);
   }
   to {
-    @include transform(rotate(360deg));
+    transform: rotate(360deg);
   }
 }

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

@@ -7,9 +7,9 @@
     position: relative;
     display: inline-block;
     margin-right: 3px;
-    border-radius: $body-font-size/2;
-    width: $body-font-size - 4px;
-    height: $body-font-size - 4px;
+    border-radius: $font-size-root/2;
+    width: $font-size-root - 4px;
+    height: $font-size-root - 4px;
   }
 
   @each $state in $states {
@@ -27,7 +27,7 @@ table tbody tr {
   &[class*="state"] td:first-child {
     border-left-width: 3px;
   }
-  &.state-complete td:first-child { border-left-color: $color-success }
-  &.state-cart     td:first-child { border-left-color: very-light($color-notice, 6) }
-  &.state-canceled td:first-child { border-left-color: $color-error }
+  &.state-complete td:first-child { border-left-color: $brand-success }
+  &.state-cart     td:first-child { border-left-color: very-light($brand-warning, 6) }
+  &.state-canceled td:first-child { border-left-color: $brand-danger }
 }

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

@@ -31,8 +31,7 @@
       padding: 0px 5px;
     }
     .variant-image,
-    .variant-details,
-    .variant-container {
+    .variant-details {
       float: left;
     }
     .variant-container {

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

@@ -1,5 +1,5 @@
 .tabs {
-  @include display(flex);
+  display: flex;
   margin: 1em 0;
   border-bottom: 1px solid $color-border;
   white-space: nowrap;
@@ -18,8 +18,8 @@
 }
 
 .tabs > li:not(.in-dropdown) {
-  @include flex-grow(0);
-  @include flex-shrink(0);
+  flex-grow: 0;
+  flex-shrink: 0;
 
   // Move down one pixel to sit on top of the ul's border-bottom
   position: relative;
@@ -44,23 +44,23 @@
   &.active:hover {
     background: white;
     border-bottom-color: white;
-    color: $color-body-text;
+    color: $body-color;
   }
 
   &:not(.active):hover > a {
     background: darken($color-tbl-thead, 5%);
-    color: $color-link;
+    color: $link-color;
   }
 }
 
 .tabs-overflowed.tabs > li:not(.tabs-dropdown) {
-  @include flex-grow(1);
-  @include flex-shrink(1);
+  flex-grow: 1;
+  flex-shrink: 1;
 }
 
 .tabs-dropdown {
-  @include flex-grow(0);
-  @include flex-shrink(0);
+  flex-grow: 0;
+  flex-shrink: 0;
   position: relative;
 
   .tabs:not(.tabs-overflowed) & {

data/app/assets/stylesheets/spree/backend/globals/_deprecation.scss

@@ -0,0 +1,17 @@
+@charset "UTF-8";
+
+/// Throws Sass warnings to announce backend deprecations. You can disable them
+/// by setting the `$output-solidus-deprecation-warnings` variable to `false`.
+///
+/// @access private
+
+$output-solidus-deprecation-warnings: true !default;
+
+@mixin solidus-deprecated-variable($variable, $replacement) {
+  @if $output-solidus-deprecation-warnings == true {
+    @if global-variable-exists($variable) {
+      @warn "[Solidus] [Deprecation] `$#{$variable}` is deprecated and will be " +
+        "removed in 3.0.0. Please use Bootstraps $#{$replacement} instead";
+    }
+  }
+}

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

@@ -4,6 +4,7 @@
 
 // Fonts
 //--------------------------------------------------------------
+@include solidus-deprecated-variable("base-font-family", "font-family-base");
 $base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
 
 // Colors
@@ -22,14 +23,18 @@ $color-7:                        #F4F4F4 !default;    // Light Gray
 $box-shadow:                     0px 3px 3px -2px hsla(0, 0%, 0%, 0.2) !default;
 
 // Body base colors
+@include solidus-deprecated-variable("color-body-bg", "body-bg");
 $color-body-bg:                  $color-1 !default;
+@include solidus-deprecated-variable("color-body-text", "body-color");
 $color-body-text:                $color-4 !default;
+@include solidus-deprecated-variable("color-headers", "headings-color");
 $color-headers:                  $color-4 !default;
+@include solidus-deprecated-variable("color-link", "link-color");
 $color-link:                     $color-3 !default;
+@include solidus-deprecated-variable("color-link-hover", "link-hover-color");
 $color-link-hover:               $color-2 !default;
-$color-link-active:              $color-2 !default;
+@include solidus-deprecated-variable("color-link-focus", "link-hover-color");
 $color-link-focus:               $color-2 !default;
-$color-link-visited:             $color-3 !default;
 $color-border:                   very-light($color-3, 12) !default;
 
 // Basic navigation colors
@@ -48,8 +53,11 @@ $color-navbar-footer-bg:        $color-sidebar-bg !default;
 $color-navbar-footer-active:    $color-2 !default;
 
 // Basic flash colors
+@include solidus-deprecated-variable("color-success", "brand-success");
 $color-success:                  $color-2 !default;
+@include solidus-deprecated-variable("color-notice", "brand-warning");
 $color-notice:                   $color-6 !default;
+@include solidus-deprecated-variable("color-error", "brand-danger");
 $color-error:                    $color-5 !default;
 
 // Color for spinner
@@ -95,8 +103,11 @@ $color-sel-disabled-bg:          $color-7 !default;
 $color-sel-disabled-text:        $color-4 !default;
 
 // Text inputs colors
+@include solidus-deprecated-variable("color-txt-brd", "input-border-color");
 $color-txt-brd:                  $color-border !default;
+@include solidus-deprecated-variable("color-txt-text", "input-color");
 $color-txt-text:                 $color-3 !default;
+@include solidus-deprecated-variable("color-txt-hover-brd", "input-border-focus");
 $color-txt-hover-brd:            $color-2 !default;
 
 // States label colors
@@ -182,17 +193,23 @@ $actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-act
 
 // Sizes
 //--------------------------------------------------------------
+
+@include solidus-deprecated-variable("body-font-size", "font-size-root");
 $body-font-size:                 13px !default;
 
+@include solidus-deprecated-variable("h6-size", "font-size-h6");
 $h6-size:                        $body-font-size + 2 !default;
+@include solidus-deprecated-variable("h5-size", "font-size-h5");
 $h5-size:                        $h6-size + 2 !default;
+@include solidus-deprecated-variable("h4-size", "font-size-h4");
 $h4-size:                        $h5-size + 2 !default;
+@include solidus-deprecated-variable("h3-size", "font-size-h3");
 $h3-size:                        $h4-size + 2 !default;
+@include solidus-deprecated-variable("h2-size", "font-size-h2");
 $h2-size:                        $h3-size + 2 !default;
+@include solidus-deprecated-variable("h1-size", "font-size-h1");
 $h1-size:                        $h2-size + 2 !default;
 
-$border-radius:                  3px !default;
-
 $font-weight-bold:               600 !default;
 $font-weight-normal:             400 !default;
 
@@ -206,3 +223,7 @@ $z-index-navbar-flyout:          1000 !default;
 // Sidebar
 //--------------------------------------------------------------
 $border-sidebar:                 1px solid $color-sidebar-border !default;
+
+// Main
+//--------------------------------------------------------------
+$main-header-height:             75px !default;

data/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss

@@ -1,4 +1,4 @@
-@mixin line-through($color: $color-2, $background: $color-1) {
+@mixin line-through($color: $color-2, $background: $body-bg) {
   position: relative;
   text-align: center;
 

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

@@ -5,28 +5,28 @@
 
   &.tooltip-top,
   &.bs-tether-element-attached-bottom {
-    .tooltip-arrow {
+    .tooltip-inner::before {
       border-top-color: $color;
     }
   }
 
   &.tooltip-right,
   &.bs-tether-element-attached-left {
-    .tooltip-arrow {
+    .tooltip-inner::before {
       border-right-color: $color;
     }
   }
 
   &.tooltip-bottom,
   &.bs-tether-element-attached-top {
-    .tooltip-arrow {
+    .tooltip-inner::before {
       border-bottom-color: $color;
     }
   }
 
   &.tooltip-left,
   &.bs-tether-element-attached-right {
-    .tooltip-arrow {
+    .tooltip-inner::before {
       border-left-color: $color;
     }
   }