From 22ebf9e376204049bee3aeaf7ae8d16d39a5649b Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 27 Aug 2014 15:58:09 +0200 Subject: [PATCH] Mobile updates --- .../user/app/templates/_list_content.emblem | 3 +++ .../javascripts/user/app/templates/application.emblem | 6 ++---- .../javascripts/user/app/templates/table.emblem | 9 +++++---- .../user/foundation/_display_fields.css.sass | 6 +++--- .../stylesheets/user/foundation/_qlists.css.sass | 5 +++-- .../stylesheets/user/foundation/_structure.css.sass | 11 +++++++++++ .../user/foundation/components/_menu_main.css.sass | 3 +++ wip.md | 3 +++ 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/user/app/templates/_list_content.emblem b/app/assets/javascripts/user/app/templates/_list_content.emblem index 8ffdc9df..0c227c45 100644 --- a/app/assets/javascripts/user/app/templates/_list_content.emblem +++ b/app/assets/javascripts/user/app/templates/_list_content.emblem @@ -10,6 +10,9 @@ if list.closed_at .display-row .display-label=t 'attributes.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.sorted_orders .list-orders-container diff --git a/app/assets/javascripts/user/app/templates/application.emblem b/app/assets/javascripts/user/app/templates/application.emblem index 68e7bd78..3af463ef 100644 --- a/app/assets/javascripts/user/app/templates/application.emblem +++ b/app/assets/javascripts/user/app/templates/application.emblem @@ -3,7 +3,7 @@ header.top-menu span .menu-content section.main-buttons - link-to 'index' + link-to 'index' class="top-menu-logo" = image_tag 'user/logo-small.png' if list.id App.MenuItemView route="active_list" @@ -15,9 +15,7 @@ header.top-menu .supplier-info-row .supplier-name= list.supplier.name .table-number - | - = t 'models.table' - |  + |#  = list.table.number .supplier-info-row .counter.supplier-orders-placed-count diff --git a/app/assets/javascripts/user/app/templates/table.emblem b/app/assets/javascripts/user/app/templates/table.emblem index 2197271b..c10a77a4 100644 --- a/app/assets/javascripts/user/app/templates/table.emblem +++ b/app/assets/javascripts/user/app/templates/table.emblem @@ -1,8 +1,9 @@ .row - h2 - =t 'models.table' - | - = number + h3 + span.supplier-name= supplier.name + span.table-number + ' # + = number if showJoinButton if join_request_sent button.disabled diff --git a/app/assets/stylesheets/user/foundation/_display_fields.css.sass b/app/assets/stylesheets/user/foundation/_display_fields.css.sass index 989ab917..d3167e0f 100644 --- a/app/assets/stylesheets/user/foundation/_display_fields.css.sass +++ b/app/assets/stylesheets/user/foundation/_display_fields.css.sass @@ -1,16 +1,16 @@ .display-row - @extend .row + +grid-row .display-label font-weight: bold @media #{$small-only} - +grid-column($columns:10, $center:true) + +grid-column($columns:5) @media #{$medium-only} +grid-column($columns:4, $offset:1) @media #{$large-up} +grid-column(3) .display-field @media #{$small-only} - +grid-column($columns:10, $center:true, $last-column:true) + +grid-column($columns: 5, $last-column:true) @media #{$medium-only} +grid-column($columns:4, $last-column:true) @media #{$large-up} diff --git a/app/assets/stylesheets/user/foundation/_qlists.css.sass b/app/assets/stylesheets/user/foundation/_qlists.css.sass index 80e43de0..4aa60e75 100644 --- a/app/assets/stylesheets/user/foundation/_qlists.css.sass +++ b/app/assets/stylesheets/user/foundation/_qlists.css.sass @@ -12,11 +12,12 @@ clear: right +panel($padding: 4px) .list-orders-container + $padding: 6px 0 6px 35px border-top: 2px solid #555 + list-style: none .currency float: right - list-style: none - $padding: 6px 0 6px 35px + margin-right: 0.5em .list-order-container background-position: left center background-repeat: no-repeat diff --git a/app/assets/stylesheets/user/foundation/_structure.css.sass b/app/assets/stylesheets/user/foundation/_structure.css.sass index 831daf8e..e52a98b4 100644 --- a/app/assets/stylesheets/user/foundation/_structure.css.sass +++ b/app/assets/stylesheets/user/foundation/_structure.css.sass @@ -1,6 +1,14 @@ +html, body + overflow-x: hidden + margin: 0 + padding: 0 +body + @media #{$small-only} + font-size: 13px #ember-app-container background-image: image-url('theme1/wall-bg.jpg') background-repeat: repeat + main.main-section +panel($bg:rgba(200,200,200,0.8)) height: 100% @@ -28,3 +36,6 @@ span.loading @extend .fa-lg &.large @extend .fa-2x + +.supplier-name + .table-number + padding-left: 0.3em diff --git a/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass index 1abb29e8..5019ed02 100644 --- a/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass +++ b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass @@ -7,6 +7,9 @@ header.top-menu color: $green padding-left: 48px padding-right: 52px + .top-menu-logo + @media #{$small-only} + display: none .menu-content background-color: white background-repeat: repeat-x diff --git a/wip.md b/wip.md index 01aa7e3d..337ea023 100644 --- a/wip.md +++ b/wip.md @@ -19,6 +19,9 @@ User - Cleanup UserController - test met veel producten +- Change language +- redirect to list on open when active list present +- Product image General -------