From 33d0302f22f650e85db88382573a70cf2bb04648 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 26 Jun 2013 15:55:01 -0400 Subject: [PATCH] studio - proofs nav's flex grid widths/alignment --- cms/static/sass/elements/_header.scss | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss index cfc1778123..f6a9805818 100644 --- a/cms/static/sass/elements/_header.scss +++ b/cms/static/sass/elements/_header.scss @@ -11,6 +11,7 @@ padding: $baseline; header.primary { + @include box-sizing(border-box); @include clearfix(); max-width: $fg-max-width; min-width: $fg-min-width; @@ -27,10 +28,6 @@ vertical-align: middle; } - .branding, .info-course, .nav-course { - margin-right: $baseline; - } - // basic layout - nav items .nav-item { @@ -60,6 +57,10 @@ .title { @extend .t-action2; + &:hover { + @extend .fake-link; + } + .label, .icon-caret-down { } @@ -103,7 +104,7 @@ } .course-title { - @extend .t-title7; + @extend .t-action3; display: block; width: 100%; overflow: hidden; @@ -131,11 +132,7 @@ .nav-item { .title { - @extend .t-action2; - &:hover { - @extend .fake-link; - } } } } @@ -168,24 +165,19 @@ .branding { width: flex-grid(2, 12); margin-right: flex-gutter(); - background: purple; } .info-course { - width: flex-grid(4, 12); + width: flex-grid(3, 12); margin-right: flex-gutter(); - background: red; } .nav-course { width: flex-grid(4, 12); - margin-right: flex-gutter(); - background: blue; } .nav-account { - width: flex-grid(2, 12); - background: green; + width: flex-grid(3, 12); } } @@ -196,12 +188,9 @@ .branding { width: flex-grid(2, 12); - margin-right: flex-gutter(); - background: purple; } .nav-pitch { width: flex-grid(10, 12); - background: green; } }