diff --git a/app/assets/javascripts/supplier/app/templates/active_list.emblem b/app/assets/javascripts/supplier/app/templates/active_list.emblem index c9fd1c00..9b745836 100644 --- a/app/assets/javascripts/supplier/app/templates/active_list.emblem +++ b/app/assets/javascripts/supplier/app/templates/active_list.emblem @@ -10,9 +10,9 @@ td.currency.total_list_amount {{currency view.content.price}} td.actions if view.content.needs_help button.mark_list_as_helped{ action markListAsHelped view.content.id} - span.fa-stack - /i.fa.fa-bell.fa-stack-1x - i.fa.fa-ban.fa-stack-2x.revoke + span.fa-stack.fa-2x.fa-stack-sized + i.fa.fa-bell.fa-stack-small + i.fa.fa-ban.revoke /span.button-text=t 'list.is_helped_button' button.close_list{ action closeList view.content.id} span.fa.fa-times.fa-2x diff --git a/app/assets/javascripts/supplier/app/templates/active_order.emblem b/app/assets/javascripts/supplier/app/templates/active_order.emblem index ef441622..b809c0f4 100644 --- a/app/assets/javascripts/supplier/app/templates/active_order.emblem +++ b/app/assets/javascripts/supplier/app/templates/active_order.emblem @@ -14,9 +14,9 @@ td.actions span.button-icon span.button-text=t 'order.being_processed' button.mark_order_delivered{ action markOrderDelivered view.content.id} - span.fa-shifted-stack - i.fa.fa-check.fa-stack-2x - i.fa.fa-check.fa-stack-2x + span.fa.fa-2x.fa-shifted-stack + span.fa-shifted.fa-check + span.fa-shifted.fa-check /span.button-text= t 'order.being_served' /button.hide.mark-order-delivered{ action markOrderDelivered view.content.id} span.button-icon diff --git a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass index 76cc4e5f..6f27aa5e 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass @@ -23,7 +23,7 @@ span.icon .mark-order-delivered .button-icon background-image: image-url('icons/order-doublecheck.png') -.fa-shifted-stack +//.fa-shifted-stack @extend .fa-stack //.fa-shifted-stack position: relative @@ -38,3 +38,22 @@ span.icon left: 20% &:first-child left: -10% +.fa-shifted-stack .fa-shifted:last-child + margin-left: -1.15rem +button, .button + .fa-shifted-stack + .fa-shifted:last-child + margin-left: -0.85rem + .fa-stack.fa-stack-sized + width: auto + height: auto + line-height: 0 // For some reason this works on supplier dashboard for list + vertical-align: -15% + .fa-stack-small + font-size: 0.5em + .fa:last-child + margin-left: -1.35rem + vertical-align: -20% + &.fa-stack-small + margin-left: -1.35rem + vertical-align: 30%