diff --git a/assets/linker/styles/app.less b/assets/linker/styles/app.less index 1cec060..3deb1a2 100644 --- a/assets/linker/styles/app.less +++ b/assets/linker/styles/app.less @@ -15,13 +15,39 @@ body { background-color: rgba(0,0,0,0.8); box-shadow: 0px 0px 20px #000; margin-top: 40px; + position: relative; + + .logo { + position: absolute; + top: -40px; + font-size: 1em; + background: rgba(0,0,0,0.8); + right: 20px; + a { + display: block; + padding: 10px 40px; + color: inherit; + &:hover { + text-decoration: none; + } + } + } h1 { + margin: 0; + padding: 20px 0 10px 0; .glyphicon { vertical-align: text-bottom; margin-right: 10px; font-size: 1.2em; } } + + h2 { + color: #ddd; + } + p,ul { + color: #ccc; + } } } diff --git a/assets/linker/styles/home.less b/assets/linker/styles/home.less index 550ddda..ffb6923 100644 --- a/assets/linker/styles/home.less +++ b/assets/linker/styles/home.less @@ -16,14 +16,10 @@ &#cta { padding: 0; } - &#copyright { - p { - margin: 0; - font-size: 0.9em; - } - padding: 15px; - } - + &#home-nav { + background: none; + padding: 0; + } .btn-block { padding: 20px; font-size: 3em; diff --git a/assets/linker/styles/nav.less b/assets/linker/styles/nav.less index 0f47ccc..7a7dfb0 100644 --- a/assets/linker/styles/nav.less +++ b/assets/linker/styles/nav.less @@ -1,5 +1,7 @@ nav { - margin-bottom: 20px; + &.navbar { + border: none; + } a { color: #fff; &:hover { @@ -9,4 +11,23 @@ nav { margin-right: 10px; } } + #main-nav { + padding: 0; + } + ul.nav li { + background: rgba(0,0,0,0.8); + margin-right: 4px; + a:hover { + background: rgba(0,0,0,1); + color: white; + } + } +} +#home-page nav { + li#home-link { + display: none; + } + li#startrun-link { + display: none; + } } diff --git a/assets/linker/templates/home.jade b/assets/linker/templates/home.jade index fbe3847..d802e08 100644 --- a/assets/linker/templates/home.jade +++ b/assets/linker/templates/home.jade @@ -4,7 +4,7 @@ #logo.pod h1 | lunch run - span.text-muted  me + span.text-muted |me .row .col-xs-12.col-sm-6 #welcome.pod @@ -21,3 +21,7 @@ a.btn.btn-block(ng-click='createRun()') | start a run   span.glyphicon.glyphicon-chevron-right + .row + .col-xs-12.col-sm-6 + #home-nav.pod + include includes/nav diff --git a/assets/linker/templates/includes/nav.jade b/assets/linker/templates/includes/nav.jade index 7bff6aa..b4be94b 100644 --- a/assets/linker/templates/includes/nav.jade +++ b/assets/linker/templates/includes/nav.jade @@ -1,26 +1,22 @@ nav.navbar(role='navigation') - .container-fluid - .navbar-header - button.navbar-toggle(type='button',data-toggle='collapse',data-target='main-nav') - span.sr-only Toggle navigation - span.icon-bar - span.icon-bar - span.icon-bar - a.navbar-brand(href='/') - | lunch run - span.text-muted  me + .navbar-header + button.navbar-toggle(type='button',data-toggle='collapse',data-target='main-nav') + span.sr-only Toggle navigation + span.icon-bar + span.icon-bar + span.icon-bar - .collapse.navbar-collapse#main-nav - ul.nav.navbar-nav - li - a(href='/') - span.glyphicon.glyphicon-home - | home - li - a(href='/about') - span.glyphicon.glyphicon-info-sign - | about - li - a(href='/#/run/create') - span.glyphicon.glyphicon-chevron-right - | start a run! + .collapse.navbar-collapse#main-nav + ul.nav.navbar-nav + li#home-link + a(href='/') + span.glyphicon.glyphicon-home + | home + li#about-link + a(href='/about') + span.glyphicon.glyphicon-question-sign + | about + li#startrun-link + a(href='/#/run/create') + span.glyphicon.glyphicon-chevron-right + | start a run! diff --git a/assets/linker/templates/layouts/interior-page.jade b/assets/linker/templates/layouts/interior-page.jade index ab8df6e..5225d15 100644 --- a/assets/linker/templates/layouts/interior-page.jade +++ b/assets/linker/templates/layouts/interior-page.jade @@ -1,6 +1,11 @@ .interior - include ../includes/nav + .logo + a(href='/') + | lunch run + span.text-muted |me h1 block pagetitle block interiorcontent + +include ../includes/nav diff --git a/views/about.jade b/views/about.jade index 9d038d5..a8b8223 100644 --- a/views/about.jade +++ b/views/about.jade @@ -1,6 +1,7 @@ extends interior-page-layout block pagetitle + span.glyphicon.glyphicon-question-sign | about lunchrun.me block interiorcontent @@ -31,8 +32,15 @@ block interiorcontent p | You can keep track of recent updates listed over there under "Recent updates". + h2 Background images + p + | All of the backgrounds have been graciously provided by Elaine Davis. They all + | belong to her 100%! + p Thanks Elaine! + .col-xs-12.col-sm-4 h2 Recent updates ul + li [5/15/14] Moved nav, "rebranded" lunch run me to lunch run|me li [5/13/14] Added meta tags li [5/13/14] Added validation messaging to create-run form diff --git a/views/includes/head.jade b/views/includes/head.jade index 05b25f5..febdad3 100644 --- a/views/includes/head.jade +++ b/views/includes/head.jade @@ -1,4 +1,4 @@ -title Lunch Run Me! +title lunch run|me meta(charset='utf-8') meta(http-equiv="X-UA-Compatible",content="IE-edge") meta(name="viewport",content="width=device-width,initial-scale=1")