From af45377679206e2fe71122df306a709c94a37937 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Mon, 11 Aug 2014 11:25:40 +0200 Subject: [PATCH] User side menu styling --- .../user/app/templates/_list_content.emblem | 7 +-- .../user/app/templates/application.emblem | 24 ++++++----- .../user/foundation/application.css.sass | 4 +- .../{ => components}/_menu_main.css.sass | 14 ------ .../foundation/components/_menu_side.css.sass | 43 +++++++++++++++++++ .../user/foundation/menu_side.css.sass | 13 ------ wip.md | 1 - 7 files changed, 61 insertions(+), 45 deletions(-) rename app/assets/stylesheets/user/foundation/{ => components}/_menu_main.css.sass (89%) create mode 100644 app/assets/stylesheets/user/foundation/components/_menu_side.css.sass delete mode 100644 app/assets/stylesheets/user/foundation/menu_side.css.sass diff --git a/app/assets/javascripts/user/app/templates/_list_content.emblem b/app/assets/javascripts/user/app/templates/_list_content.emblem index 6959fc9c..53e6ad9b 100644 --- a/app/assets/javascripts/user/app/templates/_list_content.emblem +++ b/app/assets/javascripts/user/app/templates/_list_content.emblem @@ -10,7 +10,7 @@ if list.closed_at .display-row .display-label=t 'attributes.list.state' .display-field=state 'list' list.state -if list.orders +if list.sorted_orders .list-orders-container each order in list.sorted_orders App.ListOrderView contentBinding="order" @@ -22,5 +22,6 @@ else p span=t 'active_list.no_orders_explanation' br - link-to 'lists' class="button" - span=t 'list_products.title' + if list.table + link-to 'table' list.table class="button" + span=t 'list_products.title' diff --git a/app/assets/javascripts/user/app/templates/application.emblem b/app/assets/javascripts/user/app/templates/application.emblem index 2d7ba7e3..059d2d73 100644 --- a/app/assets/javascripts/user/app/templates/application.emblem +++ b/app/assets/javascripts/user/app/templates/application.emblem @@ -7,7 +7,7 @@ section.right.tab-bar-section = link-to 'index' = image_tag 'icons/logo-small.png' - a{action openDebugger} alt="" + a{ action "openDebugger"} alt="" span.fa.fa-wrench.fa-lg .right if list.id @@ -17,8 +17,7 @@ App.MenuItemListNeedsPaymentView aside.left-off-canvas-menu ul.off-canvas-list - li - label Menu + li: h3 Menu li = link-to 'index' span Home @@ -63,9 +62,9 @@ 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 @@ -76,20 +75,23 @@ header.top-menu span.orders-in-process-count-icon aside.side-menu ul - li - label Menu + li.title: h3 Menu li = link-to 'index' span Home li - a{action scanQr bubbles=false} + a{action "scanQr" bubbles=false} + span.scan-qr-icon span Scan QR if list.id li =link-to 'table' list.table.id - span= t 'list_products.title' + span.fa.fa-cutlery + span.fa.fa-glass + = t 'list_products.title' li =link-to 'active_list' + span.active-list-icon span= t 'active_list.title' li =link-to 'lists' @@ -97,8 +99,8 @@ aside.side-menu li =link-to 'join_requests' span= t 'models.plural.join_request' - li - a{action openDebugger} + li.hide + a{action "openDebugger"} span.fa.fa-wrench.fa-lg span Debugger main.main-section diff --git a/app/assets/stylesheets/user/foundation/application.css.sass b/app/assets/stylesheets/user/foundation/application.css.sass index 37354e7d..a35e3978 100644 --- a/app/assets/stylesheets/user/foundation/application.css.sass +++ b/app/assets/stylesheets/user/foundation/application.css.sass @@ -3,8 +3,7 @@ @import font-awesome @import constants @import ./structure -@import ./menu_main -@import ./menu_side +@import ./components/* @import ./qmodal @import ./display_fields @import ./qproduct_orders @@ -13,4 +12,3 @@ @import ./qindex @import ./qlists @import ./qjoin_requests - diff --git a/app/assets/stylesheets/user/foundation/_menu_main.css.sass b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass similarity index 89% rename from app/assets/stylesheets/user/foundation/_menu_main.css.sass rename to app/assets/stylesheets/user/foundation/components/_menu_main.css.sass index ea57906b..4c461262 100644 --- a/app/assets/stylesheets/user/foundation/_menu_main.css.sass +++ b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass @@ -68,17 +68,3 @@ header.top-menu @extend .fa-check @extend .fa-lg margin-left: 3px -.toggle-side-menu - position: absolute - width: 28px - height: 28px - color: white - left: 0 - cursor: pointer - z-index: 100 - &.open - color: white - span - @extend .fa - @extend .fa-bars - @extend .fa-lg diff --git a/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass b/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass new file mode 100644 index 00000000..0c2fa8d8 --- /dev/null +++ b/app/assets/stylesheets/user/foundation/components/_menu_side.css.sass @@ -0,0 +1,43 @@ +aside.side-menu + background-color: #444 + position: fixed + display: none + left: -222px + top: 0 + width: 222px + height: 100% + z-index: 157 + > ul + list-style: none + a + color: white + .title + border-bottom: 1px solid #aaa + h3 + color: white + margin-bottom: 3px + .scan-qr-icon + margin-right: 18px + @extend .fa + @extend .fa-qrcode + .fa-glass + margin-right: 5px + .active-list-icon + margin-right: 18px + @extend .fa + @extend .fa-list + +.toggle-side-menu + position: absolute + width: 28px + height: 28px + color: white + left: 0 + cursor: pointer + z-index: 100 + &.open + color: white + span + @extend .fa + @extend .fa-lg + @extend .fa-bars diff --git a/app/assets/stylesheets/user/foundation/menu_side.css.sass b/app/assets/stylesheets/user/foundation/menu_side.css.sass deleted file mode 100644 index 63235065..00000000 --- a/app/assets/stylesheets/user/foundation/menu_side.css.sass +++ /dev/null @@ -1,13 +0,0 @@ -aside.side-menu - background-color: #444 - position: fixed - display: none - left: -222px - top: 0 - width: 222px - height: 100% - z-index: 157 - > ul - list-style: none - a - color: white diff --git a/wip.md b/wip.md index 697ec616..6c0c01bb 100644 --- a/wip.md +++ b/wip.md @@ -6,7 +6,6 @@ Supplier - better product listing with time of day in products overview - english emails -- remove kassasysteem from emails - https://github.com/buytruckload/geonames_api - website calls to action - Side menu