From 2f2ef28351e512f9ab24e57967444afbca87620a Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 21 May 2020 23:53:15 +0200 Subject: [PATCH] Use links instead of buttons and fix up styles --- app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss | 6 +++++- app/assets/stylesheets/darkswarm/ui.css.scss | 2 +- app/views/shared/menu/_cart_sidebar.html.haml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss b/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss index 07874ef5c3..e6b2becbac 100644 --- a/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss +++ b/app/assets/stylesheets/darkswarm/expanding-sidebar.css.scss @@ -54,9 +54,13 @@ transition: margin $transition-sidebar; padding: 1em; - button { + button, a.button { width: 48%; } + + a.button { + line-height: 2.75em; + } } @include breakpoint(tablet) { diff --git a/app/assets/stylesheets/darkswarm/ui.css.scss b/app/assets/stylesheets/darkswarm/ui.css.scss index 66d72d6511..5143d52cab 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.scss +++ b/app/assets/stylesheets/darkswarm/ui.css.scss @@ -124,7 +124,7 @@ button.success, .button.success { } } -button.large { +button.large, a.button.large { height: 3em; font-size: 1em; color: $white; diff --git a/app/views/shared/menu/_cart_sidebar.html.haml b/app/views/shared/menu/_cart_sidebar.html.haml index 7be2c0f1fe..1bfde559f8 100644 --- a/app/views/shared/menu/_cart_sidebar.html.haml +++ b/app/views/shared/menu/_cart_sidebar.html.haml @@ -33,7 +33,7 @@ \: {{ Cart.total() | localizeCurrency }} - %button.large.dark.left{href: main_app.cart_path, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }"} + %a.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')}' ) }}" - %button.large.bright.right{href: main_app.checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"} + %a.button.large.bright.right{href: main_app.checkout_path, "ng-disabled" => "Cart.dirty || Cart.empty()"} = t '.checkout'