User top menu fixed

This commit is contained in:
2014-09-05 10:49:51 +02:00
parent dfb55546f5
commit 7907719466
8 changed files with 51 additions and 36 deletions
@@ -1 +1,2 @@
App.ListsIndexController = Ember.ArrayController.extend App.PaginationModule App.ListsIndexController = Ember.ArrayController.extend App.PaginationModule,
lists: (->@get('model').sortBy('created_at').reverse()).property('model.@each')
@@ -1,29 +1,29 @@
header.top-menu header.top-menu
.toggle-side-menu .toggle-side-menu: span
span .top-menu-bar
.menu-content .menu-content
section.main-buttons section.main-buttons
link-to 'index' class="top-menu-logo" link-to 'index' class="top-menu-logo"
= image_tag 'user/logo-small.png' = image_tag 'user/logo-small.png'
if list.id if list.id
App.MenuItemView route="active_list" App.MenuItemView route="active_list"
App.MenuItemView route='table' route_param=list.table.id App.MenuItemView route='table' route_param=list.table.id
App.MenuItemListNeedsHelpView App.MenuItemListNeedsHelpView
App.MenuItemListNeedsPaymentView App.MenuItemListNeedsPaymentView
section.extra-info section.extra-info
if list if list
.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 .counter.supplier-orders-in-process-count
= list.supplier.orders_in_process_count = list.supplier.orders_in_process_count
span.orders-in-process-count-icon span.orders-in-process-count-icon
aside.side-menu aside.side-menu
ul ul
li.title: h3 Menu li.title: h3 Menu
@@ -1,6 +1,6 @@
.row .row
h2=t 'models.plural.list' h2=t 'models.plural.list'
each list in controller: App.ListIndexView contentBinding='list' each list in lists: App.ListIndexView contentBinding='list'
.clearfix .clearfix
if hasMore if hasMore
button{action "showMore"}=t 'lists.show_more' button{action "showMore"}=t 'lists.show_more'
@@ -7,3 +7,4 @@ $wood: image-url('theme1/wall-bg.jpg')
$background-brown: #57351f $background-brown: #57351f
$current-color: #ff0 $current-color: #ff0
$active-color: #f70 $active-color: #f70
$top-menu-height: 90px
@@ -1,6 +1,8 @@
.lists-overview-entry .lists-overview-entry
+grid-column(12) +grid-column(12)
cursor: pointer cursor: pointer
// Transparent border to get same size as active box
border: 1px solid transparent
border-bottom: 1px solid #ddd border-bottom: 1px solid #ddd
margin-bottom: 12px margin-bottom: 12px
@media #{$medium-only} @media #{$medium-only}
@@ -8,6 +8,7 @@ body
#ember-app-container #ember-app-container
background-image: image-url('theme1/wall-bg.jpg') background-image: image-url('theme1/wall-bg.jpg')
background-repeat: repeat background-repeat: repeat
padding-top: $top-menu-height
main.main-section main.main-section
+panel($bg:rgba(200,200,200,0.8)) +panel($bg:rgba(200,200,200,0.8))
@@ -1,7 +1,7 @@
@import constants
@import ./qconstants @import ./qconstants
@import ./foundation_and_overrides @import ./foundation_and_overrides
@import font-awesome @import font-awesome
@import constants
@import ./structure @import ./structure
@import ./components/* @import ./components/*
@import ./qmodal @import ./qmodal
@@ -1,12 +1,22 @@
header.top-menu header.top-menu
height: 90px // Fixed styling rules copied from foundation top-menu fixed
background-color: transparent width: 100%
background-repeat: no-repeat, no-repeat #{$default-float}: 0
background-position: left bottom, right bottom position: fixed
background-image: image-url('theme1/button-bar-left.png'), image-url('theme1/button-bar-right.png') top: 0
color: $green z-index: 99
padding-left: 48px
padding-right: 52px background-image: image-url('theme1/wall-bg.jpg')
height: $top-menu-height
.top-menu-bar
color: $green
height: $top-menu-height
background-image: image-url('theme1/button-bar-left.png'), image-url('theme1/button-bar-right.png')
background-color: transparent
background-repeat: no-repeat, no-repeat
background-position: left bottom, right bottom
padding-left: 48px
padding-right: 52px
.top-menu-logo .top-menu-logo
@media #{$small-only} @media #{$small-only}
display: none display: none