solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -33,6 +33,23 @@ nav.menu {
   z-index: $z-index-navbar-flyout;
 }
 
+.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;
+  }
+}
+
 .admin-nav-menu {
   ul {
     margin: 0;

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

@@ -2,6 +2,7 @@
   display: none;
   position: fixed;
   top: 0;
+  right: 0;
   z-index: 1000;
   opacity: 0.8;
   @include calc(width, "100% - #{$width-sidebar}");

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

@@ -0,0 +1,108 @@
+.tabs {
+  @include display(flex);
+  margin: 1em 0;
+  border-bottom: 1px solid $color-border;
+  white-space: nowrap;
+
+  &,
+  ul {
+    padding-left: 0;
+    list-style: none;
+  }
+
+  a {
+    padding: 1em;
+  }
+}
+
+.tabs > li:not(.in-dropdown) {
+  @include flex-grow(0);
+  @include flex-shrink(0);
+
+  // Move down one pixel to sit on top of the ul's border-bottom
+  position: relative;
+  top: 1px;
+
+  > a {
+    display: block;
+    border: 1px solid $color-border;
+    border-radius: 2px 2px 0 0;
+    line-height: 1;
+  }
+
+  &:not(:first-child) > a {
+    border-left: none;
+  }
+
+  &:not(.active) > a {
+    background: $color-tbl-thead;
+  }
+
+  &.active > a,
+  &.active:hover {
+    background: white;
+    border-bottom-color: white;
+    color: $color-body-text;
+  }
+
+  &:not(.active):hover > a {
+    background: darken($color-tbl-thead, 5%);
+    color: $color-link;
+  }
+}
+
+.tabs-overflowed.tabs > li:not(.tabs-dropdown) {
+  @include flex-grow(1);
+  @include flex-shrink(1);
+}
+
+.tabs-dropdown {
+  @include flex-grow(0);
+  @include flex-shrink(0);
+  position: relative;
+
+  .tabs:not(.tabs-overflowed) & {
+    display: none;
+  }
+
+  > a {
+    position: relative;
+    background: white;
+    z-index: 1;
+
+    &:before {
+      content: "\f107";
+      font-family: FontAwesome;
+      -webkit-font-smoothing: antialiased;
+    }
+  }
+
+  &:hover > a {
+    background: white;
+  }
+
+  &:not(:hover) ul {
+    display: none;
+  }
+
+  ul {
+    @include position(absolute, calc(100% - 1px) 0 null null);
+    z-index: 1;
+  }
+}
+
+.tabs li.in-dropdown {
+  a {
+    display: block;
+    border: 1px solid $color-border;
+    background: white;
+  }
+
+  &:not(:first-child) a {
+    border-top: none;
+  }
+
+  &:last-child a {
+    border-radius: 0 0 3px 3px;
+  }
+}

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

@@ -0,0 +1,47 @@
+@mixin bootstrap-tooltip-color($color) {
+  .tooltip-inner{
+    background-color: $color;
+  }
+
+  &.tooltip-top,
+  &.bs-tether-element-attached-bottom {
+    .tooltip-arrow {
+      border-top-color: $color;
+    }
+  }
+
+  &.tooltip-right,
+  &.bs-tether-element-attached-left {
+    .tooltip-arrow {
+      border-right-color: $color;
+    }
+  }
+
+  &.tooltip-bottom,
+  &.bs-tether-element-attached-top {
+    .tooltip-arrow {
+      border-bottom-color: $color;
+    }
+  }
+
+  &.tooltip-left,
+  &.bs-tether-element-attached-right {
+    .tooltip-arrow {
+      border-left-color: $color;
+    }
+  }
+}
+
+.tooltip {
+  pointer-events: none;
+
+  &.action-edit, &.action-save, &.action-capture, &.action-add {
+    @include bootstrap-tooltip-color($brand-success);
+  }
+  &.action-clone {
+    @include bootstrap-tooltip-color($brand-warning);
+  }
+  &.action-void, &.action-failure, &.action-cancel, &.action-remove {
+    @include bootstrap-tooltip-color($brand-danger);
+  }
+}

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

@@ -90,7 +90,7 @@
   font-size: 2em;
 }
 
-form#admin-ship-shipment {
+form.admin-ship-shipment {
   display: block;
   text-align: center;
   input[type='submit'] { margin-left: 5px; }

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

@@ -0,0 +1,14 @@
+/* hide and show elements based on editing */
+tr.payment {
+  .edit-payment-amount {
+    text-align: right;
+  }
+
+  &:not(.editing) .editing-show {
+    display: none;
+  }
+
+  &.editing .editing-hide {
+    display: none;
+  }
+}

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

@@ -7,17 +7,18 @@
   }
 
   > tbody {
-    > tr {
-      > td {
-        background-color: $color-tbl-odd;
-      }
-      &.even td {
+    > tr.stock-item-edit-row {
+      td {
         background-color: $color-tbl-even;
       }
-      &:first-child {
-        td {
-          border-top: none;
-        }
+      &:nth-child(even) td {
+        /* An nth-even child is actually an odd row */
+        background-color: $color-tbl-odd;
+      }
+    }
+    > tr {
+      &:first-child td {
+        border-top: none;
       }
     }
   }
@@ -37,4 +38,5 @@
       border: 1px solid $color-error;
     }
   }
+
 }

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

@@ -5,52 +5,3 @@
 #stock-transfer-transfer-items {
   margin-top: 80px;
 }
-
-#close-stock-transfer-warning,
-#ship-stock-transfer-warning,
-#finalize-stock-transfer-warning {
-  display: none;
-  width: 100%;
-  padding: 10px 20px;
-  border-radius: 4px;
-  margin-bottom: 15px;
-  color: $color-notice;
-  border: 1px solid $color-notice;
-  background-color: very-light($color-notice, 1);
-  i {
-    font-size: 30px;
-  }
-  .warning-title {
-    width: 100%;
-    text-align: center;
-    span {
-      bottom: 5px;
-      font-size: 15px;
-      position: relative;
-      margin-left: 10px;
-    }
-  }
-  .action-consequences {
-    margin-top: 10px;
-    ul {
-      margin-left: 30px;
-    }
-  }
-  .actions {
-    width: 100%;
-    margin-top: 10px;
-    text-align: right;
-    a {
-      margin: 0px 7px;
-      color: $color-notice;
-      &:hover,
-      &:active,
-      &:visited {
-        color: $color-notice;
-      }
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}

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

@@ -85,6 +85,10 @@ label {
   &.block {
     display: block !important;
   }
+
+  &.required:after {
+    content: " *";
+  }
 }
 
 .label-block label { display: block }
@@ -124,12 +128,14 @@ button, .button {
 }
 
 span.info {
-  font-style: italic;
   font-size: 85%;
   color: lighten($color-body-text, 15);
   display: block;
   line-height: 20px;
   margin: 5px 0;
+  .field & {
+    font-style: italic;
+  }
 }
 
 .field {
@@ -227,6 +233,7 @@ fieldset {
     text-transform: uppercase;
     text-align: center;
     padding: 8px 15px;
+    width: auto;
 
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
@@ -263,19 +270,9 @@ fieldset {
       }
     }
 
-    span.or {
-      background-color: $color-1;
-      border-width: 5px;
-      margin-left: 5px;
-      margin-right: 11px;
-      position: relative;
-      z-index: 1;
-
-      -webkit-box-shadow: 0 0 0 5px $color-1;
-         -moz-box-shadow: 0 0 0 5px $color-1;
-          -ms-box-shadow: 0 0 0 5px $color-1;
-           -o-box-shadow: 0 0 0 5px $color-1;
-              box-shadow: 0 0 0 5px $color-1;
+    // Always make sure the choices at the bottom of a fieldset are spaced out
+    > * + * {
+      margin-left: 2em;
     }
   }
 

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

@@ -0,0 +1,30 @@
+.main-header {
+  @include display(flex);
+  @include align-items(center);
+  margin-left: $width-sidebar;
+  padding: 15px 14px;
+  background-color: very-light($color-3, 4);
+  border-bottom: 1px solid $color-border;
+}
+
+.page-title {
+  font-size: 20px;
+  margin: 0.67em 0;
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  i {
+    color: $color-2;
+  }
+}
+
+.header-actions {
+  @include flex-grow(1);
+  text-align: right;
+  line-height: 38px;
+
+  form {
+    display: inline-block;
+  }
+}

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

@@ -1,51 +1,3 @@
-// Basics
-//---------------------------------------------------
-* {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-// Helpers
-.block-table {
-  display: table;
-  width: 100%;
-
-  .table-cell {
-    display: table-cell;
-    vertical-align: middle;
-    padding: 0 10px;
-
-    &:first-child {
-      padding-left: 0;
-    }
-    &:last-child {
-      padding-right: 0;
-    }
-  }
-}
-
-.hidden {
-  display: none;
-}
-
-// For block grids
-.frameless {
-  margin-left: -10px;
-  margin-right: -10px;
-}
-
-.container .column,
-.container .columns {
-  // Float container right instead of left.
-  .right {
-    float: right;
-  }
-}
-
-// Page Layout
-//---------------------------------------------------
-
 html {
   height: 100%;
 }
@@ -65,35 +17,6 @@ body {
   @include clearfix;
 }
 
-// Header
-//---------------------------------------------------
-.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;
-  }
-}
-
-[data-hook="admin-title"] { font-size: 14px }
-
-.page-title {
-  i {
-    color: $color-2;
-  }
-}
-
-// Content
-//---------------------------------------------------
 #content {
   background-color: $color-1;
   position: relative;
@@ -101,31 +24,3 @@ body {
   padding: 0;
   margin-top: 15px;
 }
-
-#content-header {
-  padding: 15px 0;
-  background-color: very-light($color-3, 4);
-  border-bottom: 1px solid $color-border;
-
-  .page-title {
-    font-size: 20px;
-
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  .page-actions {
-    text-align: right;
-    line-height: 38px;
-    form {
-      display: inline-block;
-    }
-  }
-}
-
-// Footer
-//---------------------------------------------------
-#footer {
-  margin-top: 15px;
-  border-top: 1px solid $color-border;
-  padding: 10px 0;
-}