From 924021d49a7d57ebdb515733b4c4e6d0211b9b06 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 12 Feb 2015 12:16:10 +0100 Subject: [PATCH 1/9] Fix loading indicator on profile page --- app/styles/app/loading.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 44ff31c86fe0199bb71edc1c8926069ed8228b54 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 12 Feb 2015 12:19:04 +0100 Subject: [PATCH 2/9] Replace title by a ruby server --- app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}} From 8589b7e97d9b6a93883e4e9452802f4834d0b7db Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 12 Feb 2015 12:20:28 +0100 Subject: [PATCH 3/9] bring back travis-pro in top --- app/styles/app/top.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/top.sass b/app/styles/app/top.sass index b9e501bd..5dd7200f 100644 --- a/app/styles/app/top.sass +++ b/app/styles/app/top.sass @@ -55,7 +55,7 @@ display: inline-block border: none - @media #{$medium} + @media #{$medium-only} li.traviscicom display: none From c9d4ccdc4820d43cfc194d5d8cf462886e03710a Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 12 Feb 2015 12:36:33 +0100 Subject: [PATCH 4/9] fix top bar stacing issues --- app/styles/app/top.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/top.sass b/app/styles/app/top.sass index 5dd7200f..a830aeca 100644 --- a/app/styles/app/top.sass +++ b/app/styles/app/top.sass @@ -1,6 +1,6 @@ #top - font-size: $font-size-small + font-size: $font-size-normal background : $topbar-bg height: 55px overflow: hidden From 07dd6c411e2f0e8db6be912f3c78190253ea4e0f Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 12 Feb 2015 12:49:51 +0100 Subject: [PATCH 5/9] fix align of hook switched --- app/styles/app/profile/hooks.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 7dac12cfea49d11d4073f45e4749bfc47d513122 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 12 Feb 2015 13:08:18 +0100 Subject: [PATCH 6/9] bring back fixed width sidebars --- app/styles/app/layout.sass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index 646327ff..d3d173b2 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -53,11 +53,12 @@ .wrapper-main overflow: hidden & > 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 @@ -75,6 +76,7 @@ width: grid-calc(5, 24) float: left margin-left: -100% + max-width: 325px .wrapper-main width: grid-calc(19, 24) From adcc8b57f4f5edc20d4fa12cbd0c15ae993a65a9 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 12 Feb 2015 15:07:02 +0100 Subject: [PATCH 7/9] finally get profile page full-height while loading --- app/styles/app/layout.sass | 14 ++++++++------ app/styles/app/tabs.sass | 4 ---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index d3d173b2..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,6 +50,7 @@ // 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(20, 24) float: left @@ -63,7 +62,6 @@ .maximized .wrapper-main - overflow: hidden & > div:first-child:nth-last-child(2) width: grid-calc(24, 24) float: none @@ -72,6 +70,10 @@ display: none @media #{$large-up} + + #left, #right, .wrapper-main + min-height: 100vh + #left width: grid-calc(5, 24) float: left 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 From 7e0fe8cb613c4b33089d5945e619a5f763a5b303 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 12 Feb 2015 16:03:35 +0100 Subject: [PATCH 8/9] add burger toggle --- app/controllers/top.coffee | 5 +++++ app/styles/app/top.sass | 20 ++++++++++++++------ app/templates/top.hbs | 4 ++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/controllers/top.coffee b/app/controllers/top.coffee index b71beef0..196b6df7 100644 --- a/app/controllers/top.coffee +++ b/app/controllers/top.coffee @@ -12,4 +12,9 @@ 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') + } + `export default Controller` diff --git a/app/styles/app/top.sass b/app/styles/app/top.sass index a830aeca..3904a624 100644 --- a/app/styles/app/top.sass +++ b/app/styles/app/top.sass @@ -2,8 +2,6 @@ #top 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 @@ -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}}
- +
-