Mobile updates

This commit is contained in:
2014-08-27 15:58:09 +02:00
parent 3b410bd493
commit 22ebf9e376
8 changed files with 33 additions and 13 deletions
@@ -10,6 +10,9 @@ if list.closed_at
.display-row .display-row
.display-label=t 'attributes.list.state' .display-label=t 'attributes.list.state'
.display-field=state 'list' list.state .display-field=state 'list' list.state
.display-row
.display-label=t 'models.supplier'
.display-field= list.supplier.name
if list.orders.isLoaded if list.orders.isLoaded
if list.sorted_orders if list.sorted_orders
.list-orders-container .list-orders-container
@@ -3,7 +3,7 @@ header.top-menu
span span
.menu-content .menu-content
section.main-buttons section.main-buttons
link-to 'index' 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"
@@ -15,9 +15,7 @@ header.top-menu
.supplier-info-row .supplier-info-row
.supplier-name= list.supplier.name .supplier-name= list.supplier.name
.table-number .table-number
| |# 
= t 'models.table'
| 
= list.table.number = list.table.number
.supplier-info-row .supplier-info-row
.counter.supplier-orders-placed-count .counter.supplier-orders-placed-count
@@ -1,7 +1,8 @@
.row .row
h2 h3
=t 'models.table' span.supplier-name= supplier.name
| span.table-number
' #
= number = number
if showJoinButton if showJoinButton
if join_request_sent if join_request_sent
@@ -1,16 +1,16 @@
.display-row .display-row
@extend .row +grid-row
.display-label .display-label
font-weight: bold font-weight: bold
@media #{$small-only} @media #{$small-only}
+grid-column($columns:10, $center:true) +grid-column($columns:5)
@media #{$medium-only} @media #{$medium-only}
+grid-column($columns:4, $offset:1) +grid-column($columns:4, $offset:1)
@media #{$large-up} @media #{$large-up}
+grid-column(3) +grid-column(3)
.display-field .display-field
@media #{$small-only} @media #{$small-only}
+grid-column($columns:10, $center:true, $last-column:true) +grid-column($columns: 5, $last-column:true)
@media #{$medium-only} @media #{$medium-only}
+grid-column($columns:4, $last-column:true) +grid-column($columns:4, $last-column:true)
@media #{$large-up} @media #{$large-up}
@@ -12,11 +12,12 @@
clear: right clear: right
+panel($padding: 4px) +panel($padding: 4px)
.list-orders-container .list-orders-container
$padding: 6px 0 6px 35px
border-top: 2px solid #555 border-top: 2px solid #555
list-style: none
.currency .currency
float: right float: right
list-style: none margin-right: 0.5em
$padding: 6px 0 6px 35px
.list-order-container .list-order-container
background-position: left center background-position: left center
background-repeat: no-repeat background-repeat: no-repeat
@@ -1,6 +1,14 @@
html, body
overflow-x: hidden
margin: 0
padding: 0
body
@media #{$small-only}
font-size: 13px
#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
main.main-section main.main-section
+panel($bg:rgba(200,200,200,0.8)) +panel($bg:rgba(200,200,200,0.8))
height: 100% height: 100%
@@ -28,3 +36,6 @@ span.loading
@extend .fa-lg @extend .fa-lg
&.large &.large
@extend .fa-2x @extend .fa-2x
.supplier-name + .table-number
padding-left: 0.3em
@@ -7,6 +7,9 @@ header.top-menu
color: $green color: $green
padding-left: 48px padding-left: 48px
padding-right: 52px padding-right: 52px
.top-menu-logo
@media #{$small-only}
display: none
.menu-content .menu-content
background-color: white background-color: white
background-repeat: repeat-x background-repeat: repeat-x
+3
View File
@@ -19,6 +19,9 @@ User
- Cleanup UserController - Cleanup UserController
- test met veel producten - test met veel producten
- Change language
- redirect to list on open when active list present
- Product image
General General
------- -------