diff --git a/cms/static/js/base.js b/cms/static/js/base.js index d77d56d43f..b2e9e328ae 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -63,7 +63,7 @@ $(document).ready(function() { }); // general link management - new window/tab - $('a[rel="external"]').attr('title','This link will open in a new browser/window tab').click(function(e) { + $('a[rel="external"]').attr('title','This link will open in a new browser window/tab').click(function(e) { window.open($(this).attr('href')); e.preventDefault(); }); diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss index 0f2e139455..e9bfa92298 100644 --- a/cms/static/sass/_cms_mixins.scss +++ b/cms/static/sass/_cms_mixins.scss @@ -28,7 +28,7 @@ } } - &:hover { + &:hover, &.active { @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15)); } } @@ -41,7 +41,7 @@ background-color: $blue; color: #fff; - &:hover { + &:hover, &.active { background-color: #62aaf5; color: #fff; } diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index c0793bcb8a..cceb1b7787 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -63,12 +63,9 @@ nav .nav-item { vertical-align: top; } -.branding, .info-course { - margin: 0 ($baseline*0.75) 0 0; -} - .branding { position: relative; + margin: 0 ($baseline*0.75) 0 0; padding-right: ($baseline*0.75); a { @@ -85,7 +82,7 @@ nav .nav-item { // specific elements - course name/info .info-course { position: relative; - margin-top: -3px; + margin: -3px ($baseline/2) 0 0; padding-right: ($baseline*0.75); @include font-size(14); @@ -475,8 +472,9 @@ nav .nav-item { .nav-item.is-current, body.howitworks .nav-not-signedin-hiw, -body.signin .nav-not-signedin-signin, -body.signup .nav-not-signedin-signup, + +// dashboard +body.dashboard .nav-account-dashboard, // course content body.course.outline .nav-course-courseware .title, @@ -509,10 +507,26 @@ body.course.export .nav-course-tools-export, { - color: $blue !important; + color: $blue; a { - color: $blue !important; + color: $blue; + } +} + +body.signup .nav-not-signedin-signin { + + a { + background-color: #d9e3ee; + color: #6d788b; + } +} + +body.signin .nav-not-signedin-signup { + + a { + background-color: #62aaf5; + color: #fff; } } diff --git a/cms/templates/widgets/footer.html b/cms/templates/widgets/footer.html index 15313a4bb6..88d56d68df 100644 --- a/cms/templates/widgets/footer.html +++ b/cms/templates/widgets/footer.html @@ -3,7 +3,7 @@