solidus_backend 2.9.6 → 2.11.0

data/app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js

@@ -0,0 +1,45 @@
+Spree.Views.Tables.SelectableTable.Summary = Backbone.View.extend({
+  events: {
+    'click input[name="select-all"]': 'onSelectedAll'
+  },
+
+  onSelectedAll: function(event) {
+    this.model.set('allSelected', event.currentTarget.checked);
+    if(event.currentTarget.checked == false) {
+      this.model.set('selectedItems', []);
+    }
+  },
+
+  initialize: function(options) {
+    this.listenTo(this.model, 'change', this.render)
+
+    this.colspan = options.columns - 1;
+
+    this.render();
+  },
+
+  render: function() {
+    var selectedItemLength = this.model.get('selectedItems').length;
+    var all_items_selected = this.model.get('allSelected');
+
+    var html = HandlebarsTemplates['tables/selectable_label']({
+      colspan: this.colspan,
+      item_selected_label: this.selectedItemLabel(all_items_selected, selectedItemLength),
+      all_items_selected: all_items_selected
+    });
+
+    this.$el.html(html);
+  },
+
+  selectedItemLabel: function(all_selected, selected_item_length) {
+    if(all_selected) {
+      return Spree.t('items_selected.all');
+    } else if(selected_item_length == 0) {
+      return Spree.t('items_selected.none');
+    } else if(selected_item_length == 1) {
+      return Spree.t('items_selected.one');
+    } else {
+      return selected_item_length + " " + Spree.t('items_selected.custom');
+    }
+  }
+});

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

@@ -85,6 +85,8 @@ $dropdown-link-hover-bg:         $color-primary !default;
 
 $breadcrumb-bg:                 transparent !default;
 $breadcrumb-active-color:       $color-primary !default;
+$breadcrumb-padding-y:          .75rem !default;
+$breadcrumb-padding-x:          0 !default;
 
 // Popover
 

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

@@ -1,15 +1,15 @@
 .breadcrumb {
   font-size: 16px;
   margin-bottom: 0;
-  
+
   a {
     color: $breadcrumb-color;
-    
+
     &:hover {
       color: $breadcrumb-active-color;
     }
   }
-  
+
   .active {
     font-weight: $font-weight-bold;
   }

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

@@ -30,6 +30,10 @@
   left: $width-sidebar;
   right: 0;
   z-index: 1000;
+
+  .admin-nav-hidden & {
+    left: $width-sidebar-collapsed;
+  }
 }
 
 .flash {

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

@@ -2,6 +2,87 @@ $padding-x-navbar: 26px;
 $padding-y-navbar: 13px;
 $padding-y-navbar-submenu: 9px;
 
+#admin-nav-toggle {
+  border-bottom: $border-sidebar;
+  padding: ($padding-y-navbar/ 2) $padding-x-navbar;
+  width: 100%;
+  text-align: left;
+  color: $color-navbar;
+  font-weight: $font-weight-bold;
+  position: relative;
+  overflow: hidden;
+  display: block;
+  height: 39px;
+  z-index: 1;
+
+  span {
+    font-size: $font-size-sm;
+    font-weight: $font-weight-bold;
+  }
+
+  &.btn {
+    background-color: transparent;
+  }
+
+  &.fa {
+    text-indent: 2em;
+
+    &:before {
+      color: $color-icon-navbar;
+      font-weight: $font-weight-normal;
+      position: absolute;
+      left: 1em;
+      top: 0;
+      line-height: 39px;
+      transform: translateX(-50%);
+      transition: transform .5s ease-in-out;
+    }
+
+    &:focus {
+      outline: 0;
+      box-shadow: none;
+    }
+  }
+}
+
+.admin-nav-hidden {
+  padding-left: $width-sidebar-collapsed;
+
+  .admin-nav,
+  .admin-nav-footer {
+    width: $width-sidebar-collapsed;
+  }
+
+  .text {
+    transform: translateX(-50px);
+    display: none;
+  }
+
+  .admin-login-nav a {
+    text-overflow: clip;
+  }
+
+  .brand-link {
+    overflow: hidden;
+  }
+
+  .admin-nav-menu {
+    li {
+      &.selected:not(:hover) > ul  {
+        visibility: hidden;
+      }
+
+      &.selected:not(:hover) .admin-subnav {
+        display: none;
+      }
+    }
+  }
+
+  .admin-nav-menu .selected li {
+    padding-left: 0;
+  }
+}
+
 nav.menu {
   ul {
     list-style: none;
@@ -26,16 +107,27 @@ nav.menu {
 }
 
 .admin-nav {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: $zindex-sticky;
+  width: $width-sidebar;
   border-right: $border-sidebar;
   background: $color-sidebar-bg;
-  z-index: $zindex-sticky;
+
+  @media print {
+    display: none
+  }
 }
 
 .admin-nav-header {
   background-color: $color-white;
   border-bottom: 1px solid $color-border;
+  border-right: 1px solid $color-border;
   text-align: center;
   padding: 0 1.25em;
+  width: $width-sidebar;
   // 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;
@@ -73,56 +165,13 @@ nav.menu {
     }
 
     &:not(.selected):not(:hover) > ul {
-      display: none;
-    }
-
-    &:not(.selected) {
-      position: relative;
-
-      // flyout nav
-      > ul {
-        position: absolute;
-        top: 0;
-        left: 100%;
-        width: $width-sidebar-flyout;
-        margin-left: 0;
-        background: $color-white;
-        box-shadow: 1px 0 4px 0 rgba(0, 0, 0, 0.1);
-        border-radius: 0 4px 4px 4px;
-        border: 1px solid $color-border;
-        @include caret($direction: left, $color-caret: $color-white);
-
-      &:before {
-        z-index: 1;
-        top: 1.5em;
-      }
-      
-      &:after {
-        content: '';
-        display: block;
-        position: absolute;
-        border-width: 1em 1em;
-        border-style: solid;
-        border-color: transparent;
-        border-right-color: $color-border;
-        left: -2.1em;
-        top: 1.5em;
-        margin-top: -1em;
-      }
-      
-      > li {
-        background: $color-white;
-        
-        a {
-          font-weight: $font-weight-bold;
-        }
-      }
-     }
+      visibility: hidden;
     }
   }
 
   a {
     display: block;
+    min-height: 39px;
     padding: $padding-y-navbar $padding-x-navbar;
     color: $color-navbar;
     font-weight: $font-weight-bold;
@@ -177,8 +226,58 @@ nav.menu {
   }
 }
 
+.admin-nav-menu li:not(.selected),
+.admin-nav-hidden .admin-nav-menu li.selected:hover {
+  position: relative;
+
+  // flyout nav
+  > ul {
+    position: absolute;
+    top: 0;
+    left: 100%;
+    width: $width-sidebar-flyout;
+    margin-left: 0;
+    background: $color-white;
+    box-shadow: 1px 0 4px 0 rgba(0, 0, 0, 0.1);
+    border-radius: 0 4px 4px 4px;
+    border: 1px solid $color-border;
+    @include caret($direction: left, $color-caret: $color-white);
+
+  &:before {
+    z-index: 1;
+    top: 1.5em;
+    pointer-events: none;
+  }
+
+  &:after {
+    content: '';
+    display: block;
+    position: absolute;
+    border-width: 1em 1em;
+    border-style: solid;
+    border-color: transparent;
+    border-right-color: $color-border;
+    left: -2.1em;
+    top: 1.5em;
+    margin-top: -1em;
+    pointer-events: none;
+  }
+
+  > li {
+    background: $color-white;
+
+    a {
+      font-weight: $font-weight-bold;
+    }
+  }
+ }
+}
+
 .admin-nav-footer {
+  width: $width-sidebar;
   background-color: $color-navbar-footer-bg;
+  border-top: $border-sidebar;
+  border-right: $border-sidebar;
 
   a {
     color: $color-navbar-footer;
@@ -191,14 +290,40 @@ nav.menu {
 
 .admin-locale-selection {
   margin: 1em;
+  position: relative;
+
+  &::after {
+    content: "\f0ac";
+    font-family: "FontAwesome";
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: .5rem 0 .5rem .25rem;
+    z-index: -1;
+  }
+
+  .admin-nav-hidden & {
+    .js-locale-selection.custom-select {
+      background-color: transparent;
+      background-position: 1.5rem center;
+      background-size: 8px 9px;
+      border: 0;
+      opacity: .6;
+      position: relative;
+      overflow: hidden;
+      text-indent: 1rem;
+      z-index: 1;
+
+      &:focus {
+        box-shadow: none;
+      }
+    }
+  }
 }
 
 .admin-nav.fits .admin-nav-footer {
   position: fixed;
   bottom: 0;
-  width: $width-sidebar;
-  border-top: $border-sidebar;
-  border-right: $border-sidebar;
 }
 
 .admin-login-nav {
@@ -226,4 +351,11 @@ nav.menu {
 
 .brand-link {
   display: block;
+  height: $main-header-height - 1px;
+  overflow: hidden;
+
+  img {
+    max-height: 100%;
+    max-width: 100%;
+  }
 }

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

@@ -169,6 +169,8 @@ $actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-act
 //--------------------------------------------------------------
 $width-sidebar:                  200px !default;
 $width-sidebar-flyout:           225px !default;
+$width-sidebar-collapsed:        52px !default;
+$sidebar-transition:             250ms ease-in !default;
 $border-sidebar:                 1px solid $color-sidebar-border !default;
 
 // Main

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

@@ -65,7 +65,11 @@
 }
 
 label[for="order_bill_address_attributes_firstname"] {
-  margin-top: 45px;
+  margin-top: 53.5px;
+}
+
+label[for="order_bill_address_attributes_name"] {
+  margin-top: 53.5px;
 }
 
 #risk_analysis legend {

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

@@ -122,6 +122,10 @@
 .style-guide-code,
 .style-guide-result {
   margin: 1rem 0;
+
+  img {
+    max-width: none;
+  }
 }
 
 .color-variables {

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

@@ -3,6 +3,7 @@ input[type="password"],
 input[type="email"],
 input[type="date"],
 input[type="datetime"],
+input[type="datetime-local"],
 input[type="time"],
 input[type="url"],
 input[type="number"],

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

@@ -1,11 +1,15 @@
 .main-header {
   display: flex;
   align-items: center;
-  padding: 15px $grid-gutter-width;
   background-color: $color-header-bg;
+  padding: ($grid-gutter-width / 2) $grid-gutter-width;
   border-bottom: 1px solid $color-border;
   height: $main-header-height;
 
+  .admin-nav-hidden & {
+    margin-left: ($width-sidebar - $width-sidebar-collapsed);
+  }
+
   @media print { display: none }
 }
 

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

@@ -12,15 +12,6 @@ body {
   background-color: $admin-body-bg;
 }
 
-.admin-nav {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: $width-sidebar;
-  @media print { display: none }
-}
-
 .content-wrapper {
   background-color: $content-wrapper-bg;
   padding-top: 1rem;