Merge pull request #6 from tvdeyen/sidebar-vertical-position-fixes

Adjust sidebar to new admin layout
nebulab · Aug 1, 2017 · 43d531f · 43d531f
2 parents 38fb6b8 + f743336
commit 43d531f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_sidebar.scss b/backend/app/assets/stylesheets/spree/backend/components/_sidebar.scss
@@ -1,11 +1,18 @@
 .content-sidebar {
+  padding-top: 0.65rem;
+
+  .has-tabs & {
+    padding-top: 3.25rem;
+  }
+
   ul {
     padding-left: 0;
   }
 }
 
 .sidebar-title {
-  @include line-through();
+  @include line-through($color: $color-border);
   color: $color-2;
   font-size: 14px;
+  font-weight: $font-weight-normal;
 }
diff --git a/backend/app/views/spree/layouts/admin.html.erb b/backend/app/views/spree/layouts/admin.html.erb
@@ -10,7 +10,7 @@
     <%= render "spree/admin/shared/flash" %>
     <%= render "spree/admin/shared/spinner" %>
 
-    <div class="content-wrapper <%= @admin_layout.presence %> <%= "has-sidebar" if content_for?(:sidebar) %>" id="wrapper" data-hook>
+    <div class="content-wrapper <%= @admin_layout.presence %> <%= "has-sidebar" if content_for?(:sidebar) %> <%= "has-tabs" if content_for?(:tabs) %>" id="wrapper" data-hook>
       <div class="content row">
         <div class="content-main col-<%= content_for?(:sidebar) ? '9' : '12' %>">
           <%= yield :tabs %>