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

More expressive user top menu

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-09-05 14:40:19 +02:00
parent 54ee94e97a
commit 93ea20346a
2 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/user/app/templates/application.emblem
+15 -14
View File
@@ -11,20 +11,21 @@ header.top-menu
App.MenuItemListNeedsHelpView App.MenuItemListNeedsHelpView
App.MenuItemListNeedsPaymentView App.MenuItemListNeedsPaymentView
App.MenuItemProductOrdersView App.MenuItemProductOrdersView
section.extra-info if list
if list .extra-info
.supplier-info-row .supplier-info-row
.supplier-name= list.supplier.name / .supplier-name= list.supplier.name
.table-number .table-number
|#  |# 
= list.table.number = list.table.number
.supplier-info-row .supplier-info-row
.counter.supplier-orders-placed-count .counter.supplier-orders-placed-count
= list.supplier.orders_placed_count = list.supplier.orders_placed_count
span.orders-placed-count-icon span.orders-placed-count-icon
.counter.supplier-orders-in-process-count .supplier-info-row
= list.supplier.orders_in_process_count .counter.supplier-orders-in-process-count
span.orders-in-process-count-icon = list.supplier.orders_in_process_count
span.orders-in-process-count-icon
aside.side-menu aside.side-menu
ul ul
li.title: h3 Menu li.title: h3 Menu
app/assets/stylesheets/user/foundation/components/_menu_main.css.sass
+22 -18
View File
@@ -32,25 +32,29 @@ header.top-menu
line-height: 48px line-height: 48px
&.main-buttons &.main-buttons
float: left float: left
font-size: 1.5em
@media #{$medium-up} @media #{$medium-up}
padding-left: 14px padding-left: 14px
&.extra-info .extra-info
float: right position: absolute
.supplier-info-row top: 0
float: right right: 0
clear: right color: white
line-height: 27px .supplier-info-row
padding-right: 7px // float: right
.table-number // clear: right
display: inline-block // line-height: 27px
//text-transform: lowercase // padding-right: 7px
.supplier-name .table-number
display: inline-block display: inline-block
.supplier-orders-placed-count //text-transform: lowercase
display: inline-block .supplier-name
margin-right: 15px display: inline-block
.supplier-orders-in-process-count .supplier-orders-placed-count
display: inline-block display: inline-block
// margin-right: 15px
.supplier-orders-in-process-count
display: inline-block
.menu-list-item .menu-list-item
margin-left: 20px margin-left: 20px
cursor: pointer cursor: pointer
@@ -59,7 +63,7 @@ header.top-menu
border-radius: 0.1em border-radius: 0.1em
display: inline-block display: inline-block
line-height: 1em line-height: 1em
margin-top: 10px margin-top: 6px
color: #999 color: #999
&.active &.active
color: $current-color color: $current-color