From 3968cfd238c14cff1a146b073c5d1fc19738d10b Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Wed, 10 Apr 2019 02:06:30 +0100 Subject: [PATCH 1/5] Fix chevron horizontal position --- app/assets/stylesheets/admin/index_panels.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/admin/index_panels.css.scss b/app/assets/stylesheets/admin/index_panels.css.scss index a7e797bea1..7095c4b3ca 100644 --- a/app/assets/stylesheets/admin/index_panels.css.scss +++ b/app/assets/stylesheets/admin/index_panels.css.scss @@ -14,6 +14,7 @@ tbody.panel-ctrl { i.icon-chevron::before { font-size: 1.2rem; content: "\f078"; + padding: 0; } &.error::before { From 896a45c399439892d20b3b7577370e4c7e51f39c Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Wed, 10 Apr 2019 02:52:20 +0100 Subject: [PATCH 2/5] Fix subs state buttons --- .../admin/components/states_decorator.scss | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/admin/components/states_decorator.scss b/app/assets/stylesheets/admin/components/states_decorator.scss index 4733f5367d..2377684416 100644 --- a/app/assets/stylesheets/admin/components/states_decorator.scss +++ b/app/assets/stylesheets/admin/components/states_decorator.scss @@ -1,7 +1,18 @@ @import "../variables"; -.state { - @extend .state; +#subscriptions .state { + border-radius: 3px; + text-transform: uppercase; + font-weight: 600; + border: 1px solid transparent; + padding: 2px 5px; + width: 100%; + display: inline-block; + text-align: center; + + &:before { + display: none; + } &.active { background-color: $spree-green; From e13db873b0fe45b8ceec0f782de63fa90a2a48b2 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Wed, 10 Apr 2019 03:20:07 +0100 Subject: [PATCH 3/5] Fix subs panel button vertical alignment --- app/assets/stylesheets/admin/index_panels.css.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/admin/index_panels.css.scss b/app/assets/stylesheets/admin/index_panels.css.scss index 7095c4b3ca..8625fbfed2 100644 --- a/app/assets/stylesheets/admin/index_panels.css.scss +++ b/app/assets/stylesheets/admin/index_panels.css.scss @@ -110,6 +110,12 @@ tbody.panel-ctrl { border-color: #6788a2; padding: 0; .panel { + .actions { + .button { + display: inline-block; + } + } + .row{ margin: 0px -4px; From 9e0f35d63594b6fdb4c01b161dae55dd2677171a Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Wed, 10 Apr 2019 03:28:33 +0100 Subject: [PATCH 4/5] Re-adjust buttons. Much better! --- app/assets/stylesheets/admin/openfoodnetwork.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss index a4a13c7fa8..4afec72515 100644 --- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss +++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss @@ -2,7 +2,7 @@ input[type="submit"], input[type="button"], button, .button { cursor: pointer; - padding: 6.5px 15px; + font-size: 85%; } .text-center { From 14fd8212835ea719fc6c570f299e29b4000eba12 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Wed, 10 Apr 2019 13:12:44 +0100 Subject: [PATCH 5/5] Rename states SCSS file for clarity --- .../{states_decorator.scss => subscriptions_states.scss} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/assets/stylesheets/admin/components/{states_decorator.scss => subscriptions_states.scss} (100%) diff --git a/app/assets/stylesheets/admin/components/states_decorator.scss b/app/assets/stylesheets/admin/components/subscriptions_states.scss similarity index 100% rename from app/assets/stylesheets/admin/components/states_decorator.scss rename to app/assets/stylesheets/admin/components/subscriptions_states.scss