Merge pull request #5426 from edx/talbs/fix-lms-header-boxmodel

FIX: LMS - New Global Header Vertical Alignment
This commit is contained in:
Brian Talbot
2014-09-30 13:40:58 -04:00
2 changed files with 7 additions and 2 deletions

View File

@@ -556,7 +556,7 @@ header.global-new {
}
.nav-global {
margin-top: ($baseline/2);
margin-top: ($baseline/4);
list-style: none;
float: left;
@@ -576,7 +576,7 @@ header.global-new {
display:block;
padding: ($baseline/4);
font-size: 18px;
padding-bottom: 20px;
padding-bottom: ($baseline*1.25);
font-weight: 600;
font-family: $header-sans-serif;
color: $courseware-navigation-color;

View File

@@ -108,6 +108,11 @@
color: $m-gray-d4;
}
// reset: navigation (needed due to edX's new global-header styling)
.global-new .nav-global a {
padding-bottom: ($baseline +1);
}
// HACK: nasty override due to our bad input/button styling
button, input[type="submit"], input[type="button"], button[type="submit"] {
@include font-size(16);