From bf81cfb6037c103d848c9d2d7490e1000b3e48cb Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Fri, 20 Jun 2014 23:36:48 -0500 Subject: [PATCH] Updated styles for buttons, update order page --- assets/linker/styles/app.less | 8 ++++-- assets/linker/styles/buttons.less | 13 +++++++++ assets/linker/styles/forms.less | 5 +++- assets/linker/styles/run.less | 6 ++--- assets/linker/styles/update-order.less | 14 ++++++++-- .../linker/templates/includes/order-nav.jade | 7 ----- assets/linker/templates/includes/run-nav.jade | 5 ++++ .../templates/invitee/update-order.jade | 27 ++++++++++--------- assets/linker/templates/run/create.jade | 2 +- assets/linker/templates/run/show.jade | 8 +++--- 10 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 assets/linker/styles/buttons.less delete mode 100644 assets/linker/templates/includes/order-nav.jade create mode 100644 assets/linker/templates/includes/run-nav.jade diff --git a/assets/linker/styles/app.less b/assets/linker/styles/app.less index 658ffed..b8dc4f9 100644 --- a/assets/linker/styles/app.less +++ b/assets/linker/styles/app.less @@ -6,6 +6,7 @@ @import "nav.less"; @import "header-footer.less"; @import "update-order.less"; +@import "buttons.less"; body { color: #fff; @@ -39,8 +40,11 @@ body { } } #page { + .btn,input,textarea { + border-radius: 0; + } .interior { - padding: 0 40px 20px; + padding: 0 40px 40px; background-color: rgba(0,0,0,0.8); box-shadow: 0px 0px 20px #000; margin-top: 40px; @@ -65,7 +69,7 @@ body { h1 { margin: 0; padding: 30px 0 30px 0; - .glyphicon { + .title-icon { vertical-align: text-bottom; margin-right: 30px; font-size: 1.2em; diff --git a/assets/linker/styles/buttons.less b/assets/linker/styles/buttons.less new file mode 100644 index 0000000..2ef8718 --- /dev/null +++ b/assets/linker/styles/buttons.less @@ -0,0 +1,13 @@ +.run-nav { + box-shadow: 5px 5px 10px #222; + .run-nav-btn { + font-size: 24px; + border-radius: 0; + text-align: center; + background-color: darkolivegreen; + color: white; + margin-right: 1px; + padding: 10px 20px; + } +} + diff --git a/assets/linker/styles/forms.less b/assets/linker/styles/forms.less index a5a39f1..48422d3 100644 --- a/assets/linker/styles/forms.less +++ b/assets/linker/styles/forms.less @@ -32,13 +32,16 @@ form { } } } -.create-order-form { +.update-order-form { textarea { font-size: 1.2em; } .btn-primary { font-size: 2em; } + .form-group { + margin: 0; + } } input.ng-dirty.ng-invalid { } diff --git a/assets/linker/styles/run.less b/assets/linker/styles/run.less index 7674b59..ee8cd30 100644 --- a/assets/linker/styles/run.less +++ b/assets/linker/styles/run.less @@ -29,7 +29,7 @@ } } - a.back-to-run { - display: none; - } +} +.run-show-run-nav a.back-to-run { + display: none; } diff --git a/assets/linker/styles/update-order.less b/assets/linker/styles/update-order.less index 905b3c6..d96f377 100644 --- a/assets/linker/styles/update-order.less +++ b/assets/linker/styles/update-order.less @@ -1,7 +1,17 @@ .others-orders { .list-group-item { border-width: 0; - background-color: transparent; + border-radius: 0; + background-color: #222; + margin-bottom: 2px; + padding: 0; + + .person { + background-color: #333; + padding: 10px 15px; + } + .order { + padding: 10px 15px; + } } } - diff --git a/assets/linker/templates/includes/order-nav.jade b/assets/linker/templates/includes/order-nav.jade deleted file mode 100644 index b43d3c0..0000000 --- a/assets/linker/templates/includes/order-nav.jade +++ /dev/null @@ -1,7 +0,0 @@ -div.btn-group.pull-right - a.btn.btn-default.back-to-run(href='/#/run/{{ run.id }}') - span.glyphicon.glyphicon-share-alt - |  Back to Run - a.btn.btn-default(href='{{ run.menuUrl }}',target="_blank",data-toggle='modal',data-target='#menuModal',ng-show='showMenuUrl') - span.glyphicon.glyphicon-list-alt - |  Show Menu diff --git a/assets/linker/templates/includes/run-nav.jade b/assets/linker/templates/includes/run-nav.jade new file mode 100644 index 0000000..4dc85ad --- /dev/null +++ b/assets/linker/templates/includes/run-nav.jade @@ -0,0 +1,5 @@ +div.run-nav.btn-group + a.btn.run-nav-btn.back-to-run(href='/#/run/{{ run.id }}',title='Back to Run') + span.glyphicon.glyphicon-share-alt + a.btn.run-nav-btn(href='{{ run.menuUrl }}',target="_blank",data-toggle='modal',data-target='#menuModal',ng-show='showMenuUrl',title='Show menu') + span.glyphicon.glyphicon-list-alt diff --git a/assets/linker/templates/invitee/update-order.jade b/assets/linker/templates/invitee/update-order.jade index fb22949..c93b86b 100644 --- a/assets/linker/templates/invitee/update-order.jade +++ b/assets/linker/templates/invitee/update-order.jade @@ -1,20 +1,21 @@ extends ../layouts/interior-page block pagetitle - span.glyphicon.glyphicon-list - span.text-muted Enter your order for:  - a(href='/#/run/{{ run.id }}') {{ run.name }} + span.glyphicon.glyphicon-list.title-icon + span.text-muted Enter your order for:  + a(href='/#/run/{{ run.id }}') {{ run.name }} + .pull-right + include ../includes/run-nav + block interiorcontent div(ng-show='show') - .clearfix - p.pull-left Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}. - include ../includes/order-nav + p Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}. .row .col-xs-12.col-sm-7 h2 Update your order - form.form.create-order-form(role='form') + form.form.update-order-form(role='form') div.form-group textarea#order.form-control(ng-model='invitee.order',placeholder='Your order',rows=8) @@ -24,11 +25,13 @@ block interiorcontent div.pod.others-orders h2 Other's orders ul.list-group(ng-repeat='i in invitees') - li.list-group-item - span.glyphicon.glyphicon-user - |   - strong {{ i.name }} - | : {{ i.order }} + li.list-group-item.clearfix + .person.pull-left + span.glyphicon.glyphicon-user + |   + strong {{ i.name }} + .order.pull-left + | {{ i.order }} block modals include ../includes/menu-modal diff --git a/assets/linker/templates/run/create.jade b/assets/linker/templates/run/create.jade index e6400c0..419dbaa 100644 --- a/assets/linker/templates/run/create.jade +++ b/assets/linker/templates/run/create.jade @@ -1,7 +1,7 @@ extends ../layouts/interior-page block pagetitle - span.glyphicon.glyphicon-chevron-right + span.glyphicon.glyphicon-chevron-right.title-icon | start a new lunch run block interiorcontent diff --git a/assets/linker/templates/run/show.jade b/assets/linker/templates/run/show.jade index ea4353f..ee9664f 100644 --- a/assets/linker/templates/run/show.jade +++ b/assets/linker/templates/run/show.jade @@ -1,15 +1,15 @@ extends ../layouts/interior-page block pagetitle - span.glyphicon.glyphicon-list + span.glyphicon.glyphicon-list.title-icon span.text-muted Lunch run status: |  {{ run.name }} + .pull-right.run-show-run-nav + include ../includes/run-nav block interiorcontent .run-details(ng-show="show") - .clearfix - p.pull-left Wait here to see real-time updates of your invitees' orders. - include ../includes/order-nav + p Wait here to see real-time updates of your invitees' orders. .progress div(class='progress-bar {{ progressClass }}',role='progressbar',aria-valuenow="{{ progress }}",aria-minvalue='0',aria-maxvalue='100',style='width:{{ progress }}%',ng-show='progress')