From d4ca5187f34cf4dbdb943d2a84dea4150ac30452 Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Sun, 22 Jun 2014 15:34:28 -0500 Subject: [PATCH] Button (page action) styling --- assets/linker/styles/app.less | 1 - assets/linker/styles/buttons.less | 13 ------------- assets/linker/styles/header-footer.less | 18 ++++++++++++++++++ assets/linker/styles/run.less | 2 +- .../linker/templates/includes/run-actions.jade | 5 +++++ assets/linker/templates/includes/run-nav.jade | 5 ----- .../linker/templates/invitee/update-order.jade | 6 +++--- .../templates/layouts/interior-page.jade | 9 +++++++-- assets/linker/templates/run/show.jade | 6 ++++-- 9 files changed, 38 insertions(+), 27 deletions(-) delete mode 100644 assets/linker/styles/buttons.less create mode 100644 assets/linker/templates/includes/run-actions.jade delete mode 100644 assets/linker/templates/includes/run-nav.jade diff --git a/assets/linker/styles/app.less b/assets/linker/styles/app.less index b8dc4f9..3aff030 100644 --- a/assets/linker/styles/app.less +++ b/assets/linker/styles/app.less @@ -6,7 +6,6 @@ @import "nav.less"; @import "header-footer.less"; @import "update-order.less"; -@import "buttons.less"; body { color: #fff; diff --git a/assets/linker/styles/buttons.less b/assets/linker/styles/buttons.less deleted file mode 100644 index 2ef8718..0000000 --- a/assets/linker/styles/buttons.less +++ /dev/null @@ -1,13 +0,0 @@ -.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/header-footer.less b/assets/linker/styles/header-footer.less index 6025baf..1b3f8b3 100644 --- a/assets/linker/styles/header-footer.less +++ b/assets/linker/styles/header-footer.less @@ -1,3 +1,21 @@ +.page-actions { + float: right; + padding: 30px 0; + + .run-actions { + box-shadow: 2px 2px 8px black; + .run-actions-btn { + font-size: 24px; + border-radius: 0; + text-align: center; + background-color: darkolivegreen; + color: white; + margin-right: 2px; + padding: 5px 20px; + } + } +} + footer { position: absolute; bottom: 0; diff --git a/assets/linker/styles/run.less b/assets/linker/styles/run.less index ee8cd30..95864bb 100644 --- a/assets/linker/styles/run.less +++ b/assets/linker/styles/run.less @@ -30,6 +30,6 @@ } } -.run-show-run-nav a.back-to-run { +.run-show-actions a.back-to-run { display: none; } diff --git a/assets/linker/templates/includes/run-actions.jade b/assets/linker/templates/includes/run-actions.jade new file mode 100644 index 0000000..22b7e07 --- /dev/null +++ b/assets/linker/templates/includes/run-actions.jade @@ -0,0 +1,5 @@ +div.run-actions.btn-group + a.btn.run-actions-btn.back-to-run(href='/#/run/{{ run.id }}',title='Back to Run') + span.glyphicon.glyphicon-share-alt + a.btn.run-actions-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/includes/run-nav.jade b/assets/linker/templates/includes/run-nav.jade deleted file mode 100644 index 4dc85ad..0000000 --- a/assets/linker/templates/includes/run-nav.jade +++ /dev/null @@ -1,5 +0,0 @@ -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 c93b86b..9cda4b7 100644 --- a/assets/linker/templates/invitee/update-order.jade +++ b/assets/linker/templates/invitee/update-order.jade @@ -4,9 +4,9 @@ block pagetitle 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 pageactions + include ../includes/run-actions block interiorcontent div(ng-show='show') diff --git a/assets/linker/templates/layouts/interior-page.jade b/assets/linker/templates/layouts/interior-page.jade index 92ffd53..819a84c 100644 --- a/assets/linker/templates/layouts/interior-page.jade +++ b/assets/linker/templates/layouts/interior-page.jade @@ -3,8 +3,13 @@ a(href='/') | lunch run span.text-muted |me - h1 - block pagetitle + .row + .col-xs-12.col-sm-8 + h1.page-title + block pagetitle + .col-xs-12.col-sm-4 + .page-actions + block pageactions block interiorcontent diff --git a/assets/linker/templates/run/show.jade b/assets/linker/templates/run/show.jade index ee9664f..edf9629 100644 --- a/assets/linker/templates/run/show.jade +++ b/assets/linker/templates/run/show.jade @@ -4,8 +4,10 @@ block pagetitle 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 pageactions + .run-show-actions + include ../includes/run-actions block interiorcontent .run-details(ng-show="show")