bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Font awesome styling update not yet fixed for stacks

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-05-28 19:20:07 +02:00
parent 901c9ac5c8
commit 78a894759b
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/supplier/app/templates/active_list.emblem
+3 -3
View File
@@ -10,9 +10,9 @@ td.currency.total_list_amount {{currency view.content.price}}
td.actions td.actions
if view.content.needs_help if view.content.needs_help
button.mark_list_as_helped{ action markListAsHelped view.content.id} button.mark_list_as_helped{ action markListAsHelped view.content.id}
span.fa-stack span.fa-stack.fa-2x.fa-stack-sized
/i.fa.fa-bell.fa-stack-1x i.fa.fa-bell.fa-stack-small
i.fa.fa-ban.fa-stack-2x.revoke i.fa.fa-ban.revoke
/span.button-text=t 'list.is_helped_button' /span.button-text=t 'list.is_helped_button'
button.close_list{ action closeList view.content.id} button.close_list{ action closeList view.content.id}
span.fa.fa-times.fa-2x span.fa.fa-times.fa-2x
app/assets/javascripts/supplier/app/templates/active_order.emblem
+3 -3
View File
@@ -14,9 +14,9 @@ td.actions
span.button-icon span.button-icon
span.button-text=t 'order.being_processed' span.button-text=t 'order.being_processed'
button.mark_order_delivered{ action markOrderDelivered view.content.id} button.mark_order_delivered{ action markOrderDelivered view.content.id}
span.fa-shifted-stack span.fa.fa-2x.fa-shifted-stack
i.fa.fa-check.fa-stack-2x span.fa-shifted.fa-check
i.fa.fa-check.fa-stack-2x span.fa-shifted.fa-check
/span.button-text= t 'order.being_served' /span.button-text= t 'order.being_served'
/button.hide.mark-order-delivered{ action markOrderDelivered view.content.id} /button.hide.mark-order-delivered{ action markOrderDelivered view.content.id}
span.button-icon span.button-icon
app/assets/stylesheets/supplier/foundation1/_qicons.css.sass
+20 -1
View File
@@ -23,7 +23,7 @@ span.icon
.mark-order-delivered .button-icon .mark-order-delivered .button-icon
background-image: image-url('icons/order-doublecheck.png') background-image: image-url('icons/order-doublecheck.png')
.fa-shifted-stack //.fa-shifted-stack
@extend .fa-stack @extend .fa-stack
//.fa-shifted-stack //.fa-shifted-stack
position: relative position: relative
@@ -38,3 +38,22 @@ span.icon
left: 20% left: 20%
&:first-child &:first-child
left: -10% 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%