From 7a60cfe9b2fc5589c84592b353ff71e94b55c3cf Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 3 Feb 2015 15:14:58 +0100 Subject: [PATCH] get layouts kind of right --- assets/styles/app/layout.sass | 46 +++++++++++++++++++++-------------- assets/styles/app/left.sass | 5 +++- assets/styles/app/top.sass | 4 +++ 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/assets/styles/app/layout.sass b/assets/styles/app/layout.sass index 6af179d9..ba7e5c07 100644 --- a/assets/styles/app/layout.sass +++ b/assets/styles/app/layout.sass @@ -22,7 +22,6 @@ min-height: 100% #left - float: left padding: 0 0 110px 0 background-color: #fbfbfa border-right: 1px solid $color-border-normal @@ -42,27 +41,38 @@ padding: 20px 30px 80px @media #{$medium-up} - #left - width: grid-calc(3, 12) - float: left - #right - width: grid-calc(2, 12) - float: right - // #main - // width: grid-calc(16, 12) - // float: right + #main - width: grid-calc(7, 12) - float: left + width: grid-calc(22, 24) + margin: auto + + #profile + #main + width: grid-calc(18, 24) + float: left + #left + width: grid-calc(24, 24) + #right + width: grid-calc(6, 24) + float: right @media #{$large-up} - // #left - // width: grid-calc(5, 24) - // max-width: 300px - // #main - // width: grid-calc(19, 24) - // float: right + #left + width: grid-calc(5, 24) + float: left + #main + width: grid-calc(19, 24) + float: right + + #profile + #left + width: grid-calc(5, 24) + #main + width: grid-calc(15, 24) + float: left + #right + width: grid-calc(4, 24) .travis-lint background-color: $travis-lint-bg diff --git a/assets/styles/app/left.sass b/assets/styles/app/left.sass index 096ceb9f..4d62b786 100644 --- a/assets/styles/app/left.sass +++ b/assets/styles/app/left.sass @@ -15,5 +15,8 @@ // @include box-sizing(border-box) border: 0 background: $color-bg-input inline-image('ui/search.svg') no-repeat 95% - background-size: 5% + background-size: 3% + + @media #{$large-up} + background-size: 5% diff --git a/assets/styles/app/top.sass b/assets/styles/app/top.sass index 55566ab4..7eb5693b 100644 --- a/assets/styles/app/top.sass +++ b/assets/styles/app/top.sass @@ -51,6 +51,10 @@ display: inline-block border: none + @media #{$medium} + li.traviscicom + display: none + #burger font-size: 50px background: none