spree_admin 5.2.0.rc2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e59ddd5613ed6add9a0bc7b66e9effa39e85f763750a3b4e2bede3e8f203da
-  data.tar.gz: bf9a3fc04741c70271817e9c81e1709e3a8de2a80f34771a3ce701391c5911d7
+  metadata.gz: 1084b5032793070ddd529dffb5ef08cff577830d4b4cd7836b3ebaa879a8f3fe
+  data.tar.gz: 9899a67d432f5d0e9edc8bd15dd44652a3550d43f54f0c8f9173ece2a3bf33ec
 SHA512:
-  metadata.gz: f513a0d0377068700800f84a23bb46eb61447252dddf16a78bda9deba79a9574c0499b562138c6c9cab7c72c98c733c81a4f1512c695aeb55f023fe2b2e58211
-  data.tar.gz: 21d4d0fcaf4029d2c5686dc73627aad315e5167b4c7d30a065bddd9f641f6bfd1dc74c780f8ec8695bb2ba0c748f30c10d997c948e934a0176b1703432bfb5c1
+  metadata.gz: d39e9737153c19ff657e3bc812b1164a303ae3d129cb0f0c1ad3c472c6e7bbd71328fd62156f22763c1b2944d8473b1c9aaba3e885a709ac3c6963e812e35b05
+  data.tar.gz: a8e26462ee6cc31561f17c271b845f939b0ba98f1ec6aed080bd6a222ba5fb1cef50d4d4d2e277d6ccbb918cca4d73ad0f130c8d7cdc3837a8fc28c84ba728a2

data/app/assets/stylesheets/spree/admin/application.scss

@@ -15,13 +15,13 @@
 @import 'components/navigation';
 @import 'components/modals'; // old bootstrap modals
 @import 'components/dialogs'; // new native dialogs
-@import 'components/offcanvas';
 @import 'components/variants_form';
 @import 'components/media_form';
 @import 'components/seo_form';
 @import 'components/line_items_form';
 @import 'components/search_picker';
 @import 'components/sortable_tree';
+@import 'components/sidebar';
 @import 'components/bulk_panel';
 @import 'components/wizard';
 

data/app/assets/stylesheets/spree/admin/components/_alerts.scss

@@ -63,7 +63,7 @@
 
   .alert {
     border-width: 1px;
-    box-shadow: $box-shadow-xs;
+    box-shadow: $box-shadow-sm;
     border-radius: $border-radius-lg;
   }
 }

data/app/assets/stylesheets/spree/admin/components/_buttons.scss

@@ -10,11 +10,13 @@ button[disabled]        .show-when-enabled { display: none; }
 }
 
 .btn {
-  box-shadow: $btn-box-shadow;
-
   transition: background-color 0.1s linear 0s, border-color 0.2s linear 0s !important;
 }
 
+.btn-primary, .btn-light, .btn-secondary {
+  box-shadow: $btn-box-shadow;
+}
+
 .btn,
 .nav-pills > li > a {
   vertical-align: middle;
@@ -31,9 +33,8 @@ button[disabled]        .show-when-enabled { display: none; }
 }
 
 .ti {
-  font-size: 130%;
+  font-size: 120%;
   vertical-align: middle;
-  line-height: 130%;
 }
 
 .btn {

data/app/assets/stylesheets/spree/admin/components/_dialogs.scss

@@ -198,7 +198,6 @@ dialog:open {
 
     .btn {
       display: inline-flex;
-      height: 2.5rem;
     }
   }
 }

data/app/assets/stylesheets/spree/admin/components/_dropdowns.scss

@@ -32,6 +32,7 @@
   padding: $dropdown-padding-y $dropdown-padding-x;
   font-size: $dropdown-font-size;
   color: $dropdown-color;
+  max-width: 20rem;
 
   .dropdown-item, .dropdown-header {
     padding-top: $dropdown-item-padding-y;
@@ -51,6 +52,8 @@
     align-items: center;
     justify-content: flex-start;
     background: transparent;
+    height: 2rem;
+    padding-right: 2rem;
 
     transition-property: background-color, color;
     transition-duration: 0.01s;
@@ -72,6 +75,9 @@
     &.btn {
       font-weight: $font-weight-base !important;
     }
+    &.btn-danger {
+      box-shadow: none;
+    }
   }
   .dropdown-item.active {
     color: theme-color('black') !important;

data/app/assets/stylesheets/spree/admin/components/_main.scss

@@ -1,7 +1,3 @@
-.sort-handle {
-  cursor: grab;
-}
-
 #page-header {
   height: 80px;
   display: flex;
@@ -74,241 +70,14 @@
   }
 }
 
-.store-dropdown {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding-left: 0.5rem;
-  padding-right: 0.75rem;
-  background-color: $sidebar-bg;
-  width: $sidebar-width;
-  border-right: 1px solid $border-color;
-  height: calc($header-height + 1px);
-}
-
-.store-dropdown-button {
-  padding: 0.25rem;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  text-align: left;
-  gap: 0.5rem;
-  box-shadow: none !important;
-
-  &:hover {
-    background-color: $gray-50;
-  }
-}
-
-.store-chooser {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-  padding: 0.25rem;
-  margin: 0.25rem;
-  border: 1px solid $border-color;
-  border-radius: $border-radius-lg;
-
-  .store-chooser-item {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    border-radius: $border-radius;
-    padding: 0.25rem;
-    text-wrap: nowrap;
-
-    &:hover {
-      text-decoration: none;
-      background-color: $dropdown-link-hover-bg;
-    }
-
-    &.active {
-      cursor: not-allowed;
-      background-color: $action;
-    }
-  }
-}
-
-#main-sidebar {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  width: $sidebar-width;
-  background-color: $sidebar-bg;
-  box-shadow: inset -1px 0 0 $border-color;
-  height: calc(100vh - $header-height);
-  overflow-x: hidden;
-  position: fixed;
-  top: $header-height;
-  padding-top: 0.8rem;
-
-  @media (max-width: 992px) {
-    display: none;
-  }
-
-  .nav {
-    padding-left: 0.75rem;
-    padding-right: 0.75rem;
-    gap: 0.2rem;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .nav-link {
-    border-radius: $nav-pills-border-radius;
-    display: flex;
-    align-items: center;
-    padding-left: 0.35rem;
-    padding-right: 0.35rem;
-    padding-top: 0.35rem;
-    padding-bottom: 0.35rem;
-    color: inherit;
-
-    transition: background-color 0.1s ease-in-out;
-
-    .ti {
-      font-size: 1.125rem !important;
-      margin-right: 0.5rem;
-      border-radius: $border-radius;
-      padding: 0.2rem 0.2rem;
-    }
-
-    &:hover {
-      background-color: $gray-50;
-
-      .ti {
-        color: theme-color('primary');
-      }
-    }
-    &.active {
-      color: theme-color('primary');
-      background-color: $white;
-      box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
-      font-weight: $font-weight-medium;
-
-      .ti {
-        background-color: theme-color('primary');
-        color: $white;
-      }
-    }
-
-    .badge:not(.badge-info) {
-      @extend .badge-light;
-    }
-  }
-
-  .nav-submenu {
-    display: flex;
-    flex-direction: column;
-    list-style: none;
-    padding-top: 0.25rem;
-    padding-left: 2rem;
-    &:before {
-      content: '';
-      position: absolute;
-      left: 1rem;
-      top: 0;
-      bottom: 0.25rem;
-      width: 1px;
-      background-color: $gray-200;
-    }
-    position: relative;
-
-    .nav-link {
-      font-weight: 400;
-      padding-top: 0.25rem;
-      padding-bottom: 0.25rem;
-
-      &:hover {
-        background-color: $gray-50;
-      }
-      &.active, &:active, &:focus {
-        font-weight: 600;
-        background-color: transparent !important;
-        box-shadow: none;
-
-        &:before {
-          content: '';
-          position: absolute;
-          left: calc(-1rem - 1px);
-          top: 10%;
-          width: 3px;
-          height: 80%;
-          background-color: theme-color('primary');
-          border-radius: $border-radius-sm;
-        }
-      }
-    }
-  }
-
-  .dropdown {
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-
-    .btn {
-      padding: 0.25rem 0.25rem;
-      border-radius: $border-radius;
-      display: flex;
-      align-items: center;
-
-      &:hover, &:focus, &:active {
-        background-color: $gray-50;
-      }
-    }
-
-    .dropdown-menu {
-      width: calc(100% - 1rem) !important;
-    }
-  }
-}
-
 #content {
+  transition: margin-left 0.1s ease;
+
   @media (min-width: 992px) {
     margin-left: $sidebar-width + 1px;
   }
 }
 
-#enterprise-edition-notice {
-  @extend .alert;
-  @extend .alert-info;
-
-  background-image: none;
-  position: relative;
-  font-size: $font-size-sm;
-  padding: 0.5rem 1rem;
-  margin: 0.75rem;
-  border-width: 1px;
-  box-shadow: $box-shadow-xs;
-  p {
-    margin-bottom: 0.5rem;
-  }
-
-  .btn-close {
-    position: absolute;
-    right: 0.25rem;
-    top: 0.25rem;
-    color: inherit !important;
-
-    &:hover {
-      background-color: transparent !important;
-    }
-  }
-}
-
-#updater-notice {
-  background-color: $white;
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  gap: 1rem;
-  justify-content: flex-start;
-  align-items: center;
-  padding: 0.5rem 0.5rem;
-  border: 1px solid $border-color;
-  border-radius: $border-radius-lg;
-  box-shadow: $box-shadow-xs;
-}
-
 
 .documentation-link-container {
   font-size: $font-size-sm;