From 3866e6d443297b1af022f6e4b746efe94bad4b67 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 14 Jan 2015 11:06:08 +0100 Subject: [PATCH] fix sidebars --- app/styles/layout/base.scss | 12 ++++++------ app/styles/layout/issues.scss | 4 ++-- app/styles/modules/common/nav.scss | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 9a0cd994..0aa146bd 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -94,20 +94,19 @@ body { .menu-secondary { background: $whitish; - flex: 1; + flex: 0 0 auto; min-width: 0; padding: 2rem 1rem; - width: 260px; + width: 320px; &.filters-bar { - flex: 0; + flex: 0 0 auto; padding: 0; transition: all .2s linear; width: 0; &.active { - flex: 1; padding: 2em 1em; transition: all .2s linear; - width: 210px; + width: 260px; .filters-inner { opacity: 1; transition: all .4s ease-in; @@ -118,8 +117,9 @@ body { .menu-tertiary { background-color: $dark-grayish-lime-green; - flex: 1; + flex: 0 0 auto; padding: 2em 1em; + width: 255px; } .extrabar { diff --git a/app/styles/layout/issues.scss b/app/styles/layout/issues.scss index 0d7d3317..d577a4a5 100644 --- a/app/styles/layout/issues.scss +++ b/app/styles/layout/issues.scss @@ -1,7 +1,7 @@ .issues { .filters-bar { - flex: 1; - width: 210px; + flex: 0 0 auto; + width: 260px; } .filters-inner { opacity: 1; diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index c5770e63..dd1a1415 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -12,12 +12,12 @@ } .logo-container { cursor: pointer; - margin: 20% 20% .7rem; + padding: 15px 15px 10px; object, img, svg { - height: 100%; - width: 100%; + height: 50px; + width: 50px; } span { @extend %large;