From 076ecfdb43708d44ca0112d39b916bf95cd62db3 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Tue, 9 Jun 2020 16:32:25 +0200
Subject: [PATCH] Adjust scrollbar visibility in sidebar

---
 .../stylesheets/darkswarm/cart-dropdown.css.scss      |  4 ++++
 .../stylesheets/darkswarm/expanding-sidebar.css.scss  |  2 +-
 app/views/shared/menu/_cart_sidebar.html.haml         | 11 ++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/cart-dropdown.css.scss b/app/assets/stylesheets/darkswarm/cart-dropdown.css.scss
index 1c17d1b517..78a1241f54 100644
--- a/app/assets/stylesheets/darkswarm/cart-dropdown.css.scss
+++ b/app/assets/stylesheets/darkswarm/cart-dropdown.css.scss
@@ -112,4 +112,8 @@
       margin-right: -100%;
     }
   }
+
+  .sidebar-footer {
+    z-index: 170;
+  }
 }
diff --git a/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss b/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss
index 04ec836112..da1034cf42 100644
--- a/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss
+++ b/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss
@@ -41,7 +41,7 @@
     background-color: rgba($white, 0.95);
     padding: 1em;
     transition: margin $transition-sidebar;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
 
   .sidebar-footer {
diff --git a/app/views/shared/menu/_cart_sidebar.html.haml b/app/views/shared/menu/_cart_sidebar.html.haml
index a792026afc..070beb3983 100644
--- a/app/views/shared/menu/_cart_sidebar.html.haml
+++ b/app/views/shared/menu/_cart_sidebar.html.haml
@@ -31,12 +31,13 @@
         %a.go-shopping.button.large.bright{ng: {show: "#{show_shopping_cta?}", href: "{{ CurrentHub.hub.id ? '#{main_app.shop_path}' : '#{main_app.shops_path}' }}"}}
           = t('.take_me_shopping')
 
-    .sidebar-footer{"ng-show" => "Cart.line_items.length > 0"}
-      %p.cart-total
-        %strong
-          = t 'total'
-          {{ Cart.total()  | localizeCurrency }}
+  .sidebar-footer{"ng-show" => "Cart.line_items.length > 0"}
+    %p.cart-total
+      %strong
+        = t 'total'
+        {{ Cart.total()  | localizeCurrency }}
 
+    %div.fullwidth
       %a.edit-cart.button.large.dark.left{href: main_app.cart_path, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }"}
         = "{{ Cart.dirty ? '#{t(:cart_updating)}' : (Cart.empty() ? '#{t(:cart_empty)}' : '#{t('.edit_cart')}' ) }}"
       %a.checkout.button.large.bright.right{href: main_app.checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"}