solidus_backend 1.1.4 → 1.2.0.beta1

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

@@ -1,11 +1,3 @@
-// Navigation
-//---------------------------------------------------
-.inline-menu {
-  margin: 0;
-  -webkit-margin-before: 0;
-  -webkit-padding-start: 0;
-}
-
 nav.menu {
   ul {
     list-style: none;
@@ -27,144 +19,136 @@ nav.menu {
         border-left-width: 0;
         border-bottom-color: $color-2;
       }
-
-      &:hover a {
-        color: $color-2;
-      }
     }
   }
 }
 
-[data-hook="admin_login_navigation_bar"] {
-  ul {
-    text-align: right;
-
-    li {
-      padding: 5px 0 5px 10px;
-      text-align: right;
-      font-size: 90%;
-      color: $color-link;
-      margin-top: 8px;
-
-      &[data-hook="user-logged-in-as"] {
-        width: 50%;
-        color: $color-body-text;
-      }
-
-      &.fa:before {
-        padding-right: 4px;
-      }
-
-      &:hover {
-        i {
-          color: $color-2;
-        }
-      }
-    }
-  }
+.admin-nav {
+  border-right: 1px solid $color-sidebar-border;
+  background: $color-sidebar-bg;
+  z-index: $z-index-navbar-flyout;
 }
 
-#admin-menu {
-  background-color: $color-3;
+.admin-nav-menu {
+  text-transform: uppercase;
 
-  ul{
-    display: table;
-    table-layout: fixed;
-    width: 100%;
+  ul {
     margin: 0;
+    padding: 0;
+    list-style: none;
   }
 
   li {
-    display: table-cell;
+    background: $color-navbar-bg;
 
-    a {
-      display: block;
-      padding: 25px 15px;
-      color: $color-1 !important;
-      text-transform: uppercase;
+    &:hover,
+    &.selected {
+      background: $color-navbar-active-bg;
+    }
+
+    &.selected li {
+      padding-left: 2em;
+    }
+
+    &:not(.selected):not(:hover) > ul {
+      display: none;
+    }
+
+    &:not(.selected) {
       position: relative;
-      text-align: center;
 
-      @media(max-width: 1009px) {
-        top: -3px;
-        margin-bottom: -5px;
+      // flyout nav
+      > ul {
+        position: absolute;
+        top: 0;
+        left: 100%;
+        width: $width-sidebar-flyout;
+        margin-left: 0;
+        padding: 1em 0;
+        border: 1px solid $color-sidebar-border;
+        background: $color-navbar-submenu-bg;
+        box-shadow: $box-shadow;
+        @include caret($direction: left, $color-caret: $color-navbar-submenu-bg);
+
+      &:before {
+        z-index: 1;
+        top: 2em;
       }
+     }
+    }
+  }
 
-      i {
-        display: inline;
-      }
+  a {
+    display: block;
+    padding: 1.5em 2em;
+    color: $color-navbar-text;
+    font-weight: normal;
+  }
 
-      &:hover {
-        background-color: $color-2;
-
-        &:after {
-          content: '';
-          position: absolute;
-          border-left: 10px solid transparent;
-          border-right: 10px solid transparent;
-          border-top: 5px solid $color-2;
-          bottom: 0px;
-          margin-bottom: -5px;
-          left: 50%;
-          margin-left: -10px;
-          z-index: 1;
-        }
-      }
+  .icon_link {
+    text-indent: 2em;
 
-      span.text {
-        font-weight: $font-weight-bold;
-      }
+    &:before {
+      position: absolute;
+      left: 1em;
+      @include transform(translateX(-50%));
     }
+  }
 
-    .dropdown {
-      width: 300px;
-      background-color: $color-3;
-      width: 200px;
-      z-index: 100000;
+  // until .fa usage is corrected
+  .text {
+    font-family: $base-font-family;
+    -webkit-font-smoothing: auto;
+    -moz-osx-font-smoothing: auto;
+  }
 
-      > li {
-        width: 200px !important;
+  .admin-subnav {
+    li {
+      background: $color-navbar-submenu-bg;
+    }
 
-        a:after {
-          display: none;
-        }
+    a {
+      color: $color-navbar-bg;
+      @include padding(1em null);
+
+      &:hover {
+        color: $color-navbar-active-bg;
       }
     }
 
-    &.selected a {
-      @extend a:hover;
+    .selected {
+      a {
+        color: $color-navbar-active-bg;
+      }
     }
   }
 }
 
-#sub-menu {
-  background-color: $color-2;
-  padding-bottom: 0;
+.admin-nav.fits .admin-nav-footer {
+  position: fixed;
+  bottom: 0;
+  width: $width-sidebar;
+  border-top: 1px solid $color-sidebar-border;
+}
+
+.admin-login-nav {
+  list-style: none;
+  margin: 0;
+  padding: 1rem 0;
 
   li {
-    a {
-      display: block;
-      padding: 12px 20px;
-      color: $color-1;
-      text-align: center;
-      text-transform: uppercase;
-      position: relative;
-      font-size: 85%;
-    }
+    padding: 0.3rem 1.2rem;
+  }
 
-    &.selected a, a:hover {
-      &:after {
-        content: '';
-        position: absolute;
-        border-left: 10px solid transparent;
-        border-right: 10px solid transparent;
-        border-top: 5px solid $color-2;
-        bottom: 0px;
-        margin-bottom: -5px;
-        left: 50%;
-        margin-left: -10px;
-        z-index: 1;
-      }
-    }
+  a {
+    display: inline-block;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  i {
+    margin-right: 0.5rem;
   }
 }

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

@@ -4,7 +4,7 @@
   top: 0;
   z-index: 1000;
   opacity: 0.8;
-  width: 100%;
+  @include calc(width, "100% - #{$width-sidebar}");
 
   .wrapper {
     border-radius: 10px;

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

@@ -23,4 +23,10 @@
       -moz-osx-font-smoothing: grayscale;
     }
   }
+
+  dl {
+    dt, dd {
+      min-height: 3em;
+    }
+  }
 }

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

@@ -18,6 +18,9 @@ $color-5:                        #C60F13 !default;    // Red
 $color-6:                        #FF9300 !default;    // Yellow
 $color-7:                        #F4F4F4 !default;    // Light Gray
 
+// Basic accents for admin
+$box-shadow:                     0px 3px 3px -2px hsla(0, 0%, 0%, 0.2);
+
 // Body base colors
 $color-body-bg:                  $color-1 !default;
 $color-body-text:                $color-4 !default;
@@ -29,6 +32,14 @@ $color-link-focus:               $color-2 !default;
 $color-link-visited:             $color-3 !default;
 $color-border:                   very-light($color-3, 12) !default;
 
+// Basic navigation colors
+$color-sidebar-bg:              $color-body-bg !default;
+$color-sidebar-border:          $color-border   !default;
+$color-navbar-bg:               $color-3 !default;
+$color-navbar-active-bg:        $color-2 !default;
+$color-navbar-submenu-bg:       very-light($color-navbar-bg, 4) !default;
+$color-navbar-text:             $color-1 !default;
+
 // Basic flash colors
 $color-success:                  $color-2 !default;
 $color-notice:                   $color-6 !default;
@@ -177,3 +188,10 @@ $border-radius:                  3px !default;
 
 $font-weight-bold:               600 !default;
 $font-weight-normal:             400 !default;
+
+$width-sidebar:                  200px !default;
+$width-sidebar-flyout:           225px !default;
+
+// Stacking
+//--------------------------------------------------------------
+$z-index-navbar-flyout:          1000;

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

@@ -0,0 +1,35 @@
+@mixin caret($width: 1em, $height: 1em, $direction: up, $color-caret: $color-3) {
+  &:before {
+    content: '';
+    display: block;
+    position: absolute;
+    border-width: $height $width;
+    border-style: solid;
+    border-color: transparent;
+
+    @if $direction == up {
+      border-bottom-color: $color-caret;
+      top: -2 * $width;
+      left: 50%;
+      margin-left: -$height;
+    }
+    @else if $direction == down {
+      border-top-color: $color-caret;
+      top: -2 * $width;
+      left: 50%;
+      margin-left: -$height;
+    }
+    @else if $direction == left {
+      border-right-color: $color-caret;
+      left: -2 * $width;
+      top: 50%;
+      margin-top: -$height;
+    }
+    @else {
+      border-left-color: $color-caret;
+      right: -2 * $width;
+      top: 50%;
+      margin-top: -$height;
+    }
+  }
+}

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

@@ -2,6 +2,7 @@
   background-color: $color-3;
   padding: 5px 15px;
   border-radius: $border-radius;
+  pointer-events: none;
 
   &.n:before, &.ne:before, &.nw:before {
     border-top-width: 5px;

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

@@ -0,0 +1,132 @@
+.style-guide {
+  @include display(flex);
+
+  &-sidebar {
+    width: 225px;
+    background: $color-7;
+    padding: 1.5rem;
+
+    .brand-link {
+      margin-top: 2rem;
+
+      img {
+        display: block;
+        width: 100px;
+        margin: 0 auto;
+      }
+    }
+
+    ul {
+      list-style: none;
+      padding-left: 0;
+    }
+  }
+
+  &-main-content {
+    @include flex(1);
+  }
+
+  ul {
+    list-style: none;
+    padding-left: 0;
+  }
+
+  &-nav {
+    text-transform: capitalize;
+
+    > li {
+      @include margin(0.5rem null);
+      @include padding(0.75rem null);
+
+      &:not(:first-of-type) {
+        border-top: 1px solid darken($color-7, 5%);
+      }
+
+      > a {
+        font-size: 1.2rem;
+        font-weight: 300;
+      }
+    }
+
+    a {
+      display: block;
+      color: darken($color-7, 65%);
+      padding: 0.3rem 0.5rem;
+
+      &:hover {
+        background: darken($color-7, 5%);
+      }
+    }
+  }
+
+  &-intro,
+  &-section:not(:last-child) {
+    margin: 4rem 0;
+  }
+
+  &-section {
+    @include clearfix;
+  }
+
+  &-section-header {
+    @include margin(7rem 0 3rem);
+    border-bottom: 1px solid darken($color-7, 10%);
+    font-size: 1.5rem;
+    font-weight: bold;
+    line-height: 0.2;
+    text-align: center;
+    text-transform: capitalize;
+
+    span {
+      background: $color-body-bg;
+      @include padding(null 0.5em);
+    }
+
+    a {
+      color: darken($color-7, 65%);
+    }
+  }
+
+  .half {
+    width: 50%;
+    float: left;
+    padding-right: 1rem;
+
+    + .half {
+      float: none;
+      margin-left: 50%;
+      padding-right: 0;
+      padding-left: 1rem;
+    }
+  }
+
+  &-code {
+    pre {
+      margin: 0;
+      border: 1px solid darken($color-7, 10%);
+    }
+  }
+}
+
+.color-variables {
+  @include display(flex);
+  @include flex-wrap(wrap);
+}
+
+.color-variable {
+  @include flex-shrink(0);
+  width: 240px;
+  padding: 1rem;
+
+  .color-swatch {
+    height: 50px;
+    border: 1px solid darken($color-7, 10%);
+  }
+}
+
+.tags {
+  .state {
+    width: 33%;
+    float: left;
+  }
+}

data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss

@@ -0,0 +1,60 @@
+#taxonomy_tree {
+  padding: 0 3em;
+
+  &,
+  ul {
+    list-style: none;
+  }
+
+  ul {
+    min-height: 0.5em;
+  }
+
+  .ui-sortable {
+    margin-bottom: 0.5em;
+  }
+
+  > li {
+    > .sortable-handle {
+      text-indent: 2em;
+
+      * {
+        text-indent: 0;
+      }
+    }
+
+    > .ui-sortable {
+      padding-bottom: 5em;
+    }
+  }
+
+  .sortable-handle ,
+  .sortable-placeholder {
+    border-radius: $border-radius;
+  }
+
+  .sortable-handle {
+    background-color: very-light($color-3);
+    border: 1px solid $color-border;
+    color: $color-body-text;
+    font-weight: $font-weight-bold;
+    padding: 0.5em;
+    cursor: move;
+
+    i {
+      @include margin(null 4px 0 6px);
+    }
+
+    .actions a {
+      margin-left: 8px;
+    }
+  }
+
+  .ui-sortable-over {
+    padding-bottom: 1em;
+  }
+
+  .ui-sortable-handle:first-child {
+    margin-top: 1em;
+  }
+}

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -137,6 +137,8 @@ span.info {
 
   &.checkbox {
     min-height: 73px;
+    @include display(flex);
+    @include align-items(center);
 
     input[type="checkbox"] {
       display: inline-block;

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

@@ -43,14 +43,46 @@
   }
 }
 
+// Page Layout
+//---------------------------------------------------
+
+html {
+  height: 100%;
+}
+
+body {
+  position: relative;
+  min-height: 100%;
+}
+
+.admin-nav {
+  @include position(absolute, 0 null 0 0);
+  width: $width-sidebar;
+}
+
+.main-content {
+  margin-left: $width-sidebar;
+  @include clearfix;
+}
+
 // Header
 //---------------------------------------------------
-#header {
+.admin-nav-header {
+  padding: 15px;
+  height: 58px; // height of .page-title
+  box-sizing: content-box;
   background-color: $color-1;
-  padding: 5px 0;
-}
+  border-bottom: 1px solid $color-border;
 
-#logo { height: 40px }
+  a {
+    display: inline-block;
+    line-height: 58px;
+  }
+
+  img {
+    vertical-align: middle;
+  }
+}
 
 [data-hook="admin-title"] { font-size: 14px }
 

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -62,6 +62,8 @@ h6 { font-size: $h6-size; line-height: $h1-size }
 //--------------------------------------------------------------
 ul {
   &.inline-menu {
+    margin: 0;
+
     li {
       display: inline-block;
     }
@@ -98,6 +100,7 @@ dl {
     padding-left: 0;
     text-transform: uppercase;
     font-size: 85%;
+    clear: left;
   }
 
   dd {
@@ -105,12 +108,6 @@ dl {
     padding-right: 0;
     margin-left: 0;
   }
-
-  dd:after {
-    content: '';
-    clear: both;
-  }
-
 }
 
 .dl-collapse {

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

@@ -4,6 +4,8 @@
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
 
+@import 'spree/backend/globals/mixins/caret';
+
 @import 'spree/backend/shared/typography';
 @import 'spree/backend/shared/tables';
 @import 'spree/backend/shared/icons';
@@ -29,7 +31,6 @@
 @import 'spree/backend/plugins/powertip';
 @import 'spree/backend/plugins/select2';
 @import 'spree/backend/plugins/token-input';
-@import 'spree/backend/plugins/jstree';
 
 @import 'spree/backend/sections/adjustments_table';
 @import 'spree/backend/sections/orders';
@@ -40,9 +41,11 @@
 @import 'spree/backend/sections/return_authorizations';
 @import 'spree/backend/sections/tax_zones';
 @import 'spree/backend/sections/log_entries';
+@import 'spree/backend/sections/taxonomies';
 @import 'spree/backend/sections/taxons';
 @import 'spree/backend/sections/users';
 @import 'spree/backend/sections/store_credits';
 @import 'spree/backend/sections/stock_management';
 @import 'spree/backend/sections/transfer_items';
 @import 'spree/backend/sections/stock_transfers';
+@import 'spree/backend/sections/style_guide';

data/app/assets/stylesheets/spree/backend.css

@@ -3,13 +3,13 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
 
- *= require responsive-tables
  *= require normalize
  *= require skeleton
  *= require jquery-ui/datepicker
  *= require jquery-ui/autocomplete
  *= require jquery.powertip
  *= require select2
+ *= require prism
 
  *= require spree/backend/spree_admin
 */