diff --git a/app/controllers/top.coffee b/app/controllers/top.coffee index b71beef0..614d18ea 100644 --- a/app/controllers/top.coffee +++ b/app/controllers/top.coffee @@ -12,4 +12,10 @@ Controller = Ember.Controller.extend "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm" ).property('user.gravatarId') + actions: { + toggleBurgerMenu: -> + @toggleProperty('is-open') + return false + } + `export default Controller` diff --git a/app/index.html b/app/index.html index 993dbc13..7d63a71d 100644 --- a/app/index.html +++ b/app/index.html @@ -3,7 +3,7 @@ - Travis + {{title}} diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index 646327ff..022777e9 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -2,7 +2,8 @@ .centered .row max-width: 1024px -.main, .profile-view +.main, +.profile-view position: relative width: 100% min-height: 100vh @@ -14,13 +15,10 @@ #not-found #main padding: 100px 50px 0 50px - -#left, #right +#left, #right, .wrapper-main position: relative - min-height: 100% #left - min-height: 100% padding: 0 0 110px 0 background-color: #fbfbfa border-right: 1px solid $color-border-normal @@ -52,17 +50,18 @@ // layout magic http://lea.verou.me/2011/01/styling-children-based-on-their-number-with-css3/ .wrapper-main overflow: hidden + height: 100% & > div:first-child:nth-last-child(2) - width: grid-calc(18, 24) + width: grid-calc(20, 24) float: left & > div:first-child:nth-last-child(2) ~ div - width: grid-calc(6, 24) + width: grid-calc(4, 24) + max-width: 180px float: right .maximized .wrapper-main - overflow: hidden & > div:first-child:nth-last-child(2) width: grid-calc(24, 24) float: none @@ -71,10 +70,15 @@ display: none @media #{$large-up} + + #left, #right, .wrapper-main + min-height: 100vh + #left width: grid-calc(5, 24) float: left margin-left: -100% + max-width: 325px .wrapper-main width: grid-calc(19, 24) diff --git a/app/styles/app/loading.sass b/app/styles/app/loading.sass index 1a66a3bc..741431fa 100644 --- a/app/styles/app/loading.sass +++ b/app/styles/app/loading.sass @@ -1,5 +1,5 @@ -div.loading +div.loading, p.loading padding: 15px 25px 0 0 span padding-right: 25px diff --git a/app/styles/app/profile/hooks.sass b/app/styles/app/profile/hooks.sass index 6cece36d..7d6b6b09 100644 --- a/app/styles/app/profile/hooks.sass +++ b/app/styles/app/profile/hooks.sass @@ -51,7 +51,7 @@ .controls position: absolute - top: 10px + top: 8px right: 0 white-space: nowrap a diff --git a/app/styles/app/tabs.sass b/app/styles/app/tabs.sass index 6c00f3e6..94a1c02c 100644 --- a/app/styles/app/tabs.sass +++ b/app/styles/app/tabs.sass @@ -72,10 +72,6 @@ #tab_new.display display: inline-block - @media #{$medium-up} - .tab - min-height: 100vh - #main .tabs border-bottom: 3px solid #f5f5f6 diff --git a/app/styles/app/top.sass b/app/styles/app/top.sass index b9e501bd..3904a624 100644 --- a/app/styles/app/top.sass +++ b/app/styles/app/top.sass @@ -1,9 +1,7 @@ #top - font-size: $font-size-small + font-size: $font-size-normal background : $topbar-bg - height: 55px - overflow: hidden #logo position: relative @@ -21,6 +19,12 @@ @include resetul line-height: 30px + #navigation + height: 0 + overflow: hidden + &.is-open + height: auto + a, span color: $white text-decoration: none @@ -47,6 +51,11 @@ @media #{$medium-up} overflow: visible + height: 55px + + #navigation + height: auto + overflow: visible ul line-height: 55px position: relative @@ -55,7 +64,7 @@ display: inline-block border: none - @media #{$medium} + @media #{$medium-only} li.traviscicom display: none @@ -76,13 +85,12 @@ &:hover cursor: pointer - - &.is-open - height: auto - .menu position: relative + &.signed-out + ul + display: none .handle margin: 0 diff --git a/app/templates/top.hbs b/app/templates/top.hbs index cd49aca9..dcd73aa1 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -5,10 +5,10 @@ {{/link-to}}
- +
-