diff --git a/app/assets/javascripts/supplier/app/templates/_list_content.emblem b/app/assets/javascripts/supplier/app/templates/_list_content.emblem index d1073f30..4721a943 100644 --- a/app/assets/javascripts/supplier/app/templates/_list_content.emblem +++ b/app/assets/javascripts/supplier/app/templates/_list_content.emblem @@ -12,7 +12,7 @@ if list.closed_at .display-row .display-label   .display-field: App.CloseListButtonView content=list -.row +.user-info-container each user in list.users =user.facebook_image_tag if list.sorted_orders diff --git a/app/assets/javascripts/supplier/app/templates/index.emblem b/app/assets/javascripts/supplier/app/templates/index.emblem index b0f207e3..427a5f73 100644 --- a/app/assets/javascripts/supplier/app/templates/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/index.emblem @@ -7,7 +7,7 @@ table.active-lists-table.table thead tr - th.user-info + th.user-info.show-for-large-up th.status-icons th.numeric=t 'table_number' th=t 'models.section' @@ -21,7 +21,7 @@ table.active-orders-table.table thead tr - th.user-info + th.user-info.show-for-large-up th.status-icons th=t 'models.order' th.numeric=t 'table_number' diff --git a/app/assets/javascripts/supplier/app/templates/list.emblem b/app/assets/javascripts/supplier/app/templates/list.emblem index 3a4ac5df..d833a0f1 100644 --- a/app/assets/javascripts/supplier/app/templates/list.emblem +++ b/app/assets/javascripts/supplier/app/templates/list.emblem @@ -1,5 +1,4 @@ -.row - h2=t 'models.list' - partial "list_content" - link-to 'lists' class="button" - span=t 'list.go_to_lists' +h2=t 'models.list' +partial "list_content" +link-to 'lists' class="button" + span=t 'list.go_to_lists' diff --git a/app/assets/stylesheets/supplier/foundation1/_qdisplays.css.sass b/app/assets/stylesheets/supplier/foundation1/_qdisplays.css.sass index 989ab917..91fc251d 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qdisplays.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qdisplays.css.sass @@ -1,5 +1,5 @@ .display-row - @extend .row + +grid-row(nest) .display-label font-weight: bold @media #{$small-only} diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index 168351be..e8974e2d 100644 --- a/app/views/layouts/tablet.html.slim +++ b/app/views/layouts/tablet.html.slim @@ -44,7 +44,7 @@ html lang="en" - if content_for?(:row) .row= yield :row .row - .span12 + .large-12.columns #ember-app-container = yield :footer javascript: diff --git a/wip.md b/wip.md index d29485b7..74a0bf62 100644 --- a/wip.md +++ b/wip.md @@ -9,7 +9,6 @@ Supplier - Dashboard - Empty state - Add qr print functionality offering to send the stickers -- Sort orders by date in dashboard - Show order time in dashboard User @@ -23,8 +22,6 @@ Bugs -- User order added, not added for other users - Post release ============