diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee index f48f9d7..24cbebe 100644 --- a/assets/linker/js/app.coffee +++ b/assets/linker/js/app.coffee @@ -7,9 +7,6 @@ lunchApp = angular.module 'lunchApp', [ lunchApp.config ['$routeProvider', ($routeProvider) -> $routeProvider - .when '/', - templateUrl: 'templates/home.html', - controller: 'HomeCtrl' .when '/run/:id', templateUrl: 'templates/run.html', controller: 'RunCtrl' diff --git a/assets/linker/styles/app.less b/assets/linker/styles/app.less index 6e2c4af..1c997b8 100644 --- a/assets/linker/styles/app.less +++ b/assets/linker/styles/app.less @@ -1,103 +1,9 @@ @import "variables.less"; @import "main.less"; +@import "home.less"; @import "header-footer.less"; @import "forms.less"; #page { padding-bottom: 60px; - section { - background-color: transparent; - position: relative; - overflow: hidden; - padding: 40px; - margin: 20px 0; - border-width: 1px; - border-style: solid; - border-color: #fff; - box-shadow: 0 0 15px #000; - border-radius: 4px; - - .step-num { - text-align: center; - text-shadow: 2px 2px 8px #fff; - span { - font-size: 6em; - } - } - - h2 { - margin-top: 0; - color: #fff; - text-shadow: 2px 2px 2px #000; - } - - input { - font-size: 2em; - height: auto; - margin: 5px 0; - } - - &.name { - input { - margin-top: 16px; - } - } - - &.invitees { - input { - margin: 0; - } - .btn { - font-size: 2em; - } - .invitee { - input { - float: left; - width: auto; - margin-right: 5px; - } - margin-top: 5px; - +.btn { - margin-top: 5px; - } - } - } - - &.submit { - border: none; - box-shadow: none; - padding: 40px 0; - .btn { - font-size: 6em; - } - } - - >div { - position: relative; - z-index: 2; - } - .bg { - position: absolute; - left: 0; - top: 0; - z-index: 1; - background-color: #eee; - opacity: 0.7; - width: 100%; - height: 100%; - } - } -} -.run-order-status { - background-color: #fff; - border: 1px solid #ddd; - margin-bottom: 10px; - >div { - padding: 20px; - } - .name { - color: #aaa; - } - .fill>.btn { - } } diff --git a/assets/linker/styles/header-footer.less b/assets/linker/styles/header-footer.less index e38284e..f70b27d 100644 --- a/assets/linker/styles/header-footer.less +++ b/assets/linker/styles/header-footer.less @@ -1,5 +1,4 @@ header.navbar { - border-bottom: 1px solid #eee; } footer.navbar { border-top: 1px solid #eee; diff --git a/assets/linker/styles/home.less b/assets/linker/styles/home.less new file mode 100644 index 0000000..fa07d86 --- /dev/null +++ b/assets/linker/styles/home.less @@ -0,0 +1,5 @@ +#welcome { + margin-top: 50px; + padding: 20px; + background-color: rgba(0,0,0,0.6); +} diff --git a/assets/linker/styles/run.less b/assets/linker/styles/run.less new file mode 100644 index 0000000..a8314e2 --- /dev/null +++ b/assets/linker/styles/run.less @@ -0,0 +1,13 @@ +.run-order-status { + background-color: #fff; + border: 1px solid #ddd; + margin-bottom: 10px; + >div { + padding: 20px; + } + .name { + color: #aaa; + } + .fill>.btn { + } +} diff --git a/assets/linker/templates/home.jade b/assets/linker/templates/home.jade index 1039aa2..e69de29 100644 --- a/assets/linker/templates/home.jade +++ b/assets/linker/templates/home.jade @@ -1 +0,0 @@ -include create-run diff --git a/views/header.jade b/views/header.jade index 3000b55..d420198 100644 --- a/views/header.jade +++ b/views/header.jade @@ -1,5 +1,3 @@ -header.navbar.navbar-static-top - .bg   - .container - a.navbar-brand(href='/') lunch run me - small.navbar-text ...where lunch runs are fun +header.navbar.navbar-default + a.navbar-brand(href='/') lunch run me + small.navbar-text ...where lunch runs are fun diff --git a/views/home/index.jade b/views/home/index.jade index ea04b83..dd1dc26 100644 --- a/views/home/index.jade +++ b/views/home/index.jade @@ -1,4 +1,6 @@ extends ../layout block content - #content + .row + #welcome.col-sm-3.offset-sm-1 + | hello there diff --git a/views/layout.jade b/views/layout.jade index 41f0e30..46c9b37 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -17,10 +17,10 @@ html(lang="en",ng-app="lunchApp") body(ng-controller="BodyCtrl") - include header - #page - div(ng-view) - include footer + .container + #page + block content + div(ng-view) // TEMPLATES