From 3ad2c9f7c4f3c427f60d8ff74673e4d9a40d0f9a Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 1 Apr 2019 11:41:46 +0100 Subject: [PATCH 1/5] Fix 'clear all' button width on Order Cycles page --- app/views/admin/order_cycles/_filters.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/order_cycles/_filters.html.haml b/app/views/admin/order_cycles/_filters.html.haml index 7cb735dd8a5..a798f0ebe4c 100644 --- a/app/views/admin/order_cycles/_filters.html.haml +++ b/app/views/admin/order_cycles/_filters.html.haml @@ -12,10 +12,10 @@ %label{ :for => 'schedule_filter' }=t('admin.order_cycles.index.schedule') %br %input.ofn-select2.fullwidth{ id: 'schedule_filter', type: 'number', blank: "{id: 0, name: '#{j t(".any_schedule")}'}", data: 'schedules', ng: { model: 'scheduleFilter' } } - .two.columns   + .one.columns   - else - .six.columns   - .filter_clear.two.columns.omega + .five.columns   + .filter_clear.three.columns.omega %label{ :for => 'clear_all_filters' } %br %input.red.fullwidth{ :type => 'button', :id => 'clear_all_filters', :value => "#{t('admin.clear_all')}", ng: { click: "resetSelectFilters()" } } From fa91a66de6bbd92463f7ab63c6d55b3b7517c45a Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 1 Apr 2019 11:48:18 +0100 Subject: [PATCH 2/5] Fix button padding after Spree 2 font changes increased the vertical height --- app/assets/stylesheets/admin/openfoodnetwork.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss index a08221b722d..a4a13c7fa83 100644 --- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss +++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss @@ -2,6 +2,7 @@ input[type="submit"], input[type="button"], button, .button { cursor: pointer; + padding: 6.5px 15px; } .text-center { From 082be15df2c4d3d3b20158e8ba8a8bb2176b1984 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 1 Apr 2019 12:00:29 +0100 Subject: [PATCH 3/5] Fix admin menu mixed font weights --- .../stylesheets/admin/components/admin-menu.css.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/assets/stylesheets/admin/components/admin-menu.css.scss diff --git a/app/assets/stylesheets/admin/components/admin-menu.css.scss b/app/assets/stylesheets/admin/components/admin-menu.css.scss new file mode 100644 index 00000000000..54123ab586d --- /dev/null +++ b/app/assets/stylesheets/admin/components/admin-menu.css.scss @@ -0,0 +1,11 @@ +#admin-menu { + li { + a { + font-weight: 600; + } + + a::before { + font-weight: normal; + } + } +} From 4a0e5a42a3690b941b1e8c05792950050ba67a8d Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 1 Apr 2019 12:11:29 +0100 Subject: [PATCH 4/5] Fix admin menu items different heights --- app/assets/stylesheets/admin/components/admin-menu.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/admin/components/admin-menu.css.scss b/app/assets/stylesheets/admin/components/admin-menu.css.scss index 54123ab586d..fd31bcda1c4 100644 --- a/app/assets/stylesheets/admin/components/admin-menu.css.scss +++ b/app/assets/stylesheets/admin/components/admin-menu.css.scss @@ -6,6 +6,7 @@ a::before { font-weight: normal; + padding-top: 0; } } } From 668a37f5642e8134e0135ec58e7ebb02343c3ec9 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 1 Apr 2019 12:18:19 +0100 Subject: [PATCH 5/5] Fix "clear all" button spacing in inventory --- app/views/admin/variant_overrides/_filters.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/admin/variant_overrides/_filters.html.haml b/app/views/admin/variant_overrides/_filters.html.haml index 4126be93178..bafb413ae52 100644 --- a/app/views/admin/variant_overrides/_filters.html.haml +++ b/app/views/admin/variant_overrides/_filters.html.haml @@ -3,7 +3,6 @@ %label{for: 'query', ng: {class: '{disabled: !hub_id}'} }=t('admin.quick_search') %br %input.fullwidth{type: "text", id: 'query', ng: {model: 'query', disabled: '!hub_id'} } - .one.columns   .filter_select.three.columns %label{for: 'hub_id', ng: {bind: "hub_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" } } %br @@ -25,7 +24,7 @@ -# %label{ :for => 'order_cycle_filter' }Order Cycle -# %br -# %select{ :class => "three columns alpha", :id => 'order_cycle_filter', 'select2-min-search' => 5, 'ng-model' => 'orderCycleFilter', 'ng-options' => 'oc.id as oc.name for oc in orderCycles', 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()'} - .filter_clear.two.columns.omega + .filter_clear.three.columns.omega %label{ :for => 'clear_all_filters' } %br %input.red.fullwidth{ :type => 'button', :id => 'clear_all_filters', :value => "#{t('admin.clear_all')}", ng: { click: "resetSelectFilters()", disabled: '!hub_id'} }