diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index bd889cef50..905abe92e0 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -157,6 +157,22 @@ h1 { margin-bottom: 0; } } + + .nav-related { + + .nav-item { + margin-bottom: ($baseline/4); + border-bottom: 1px dotted $gray-l4; + padding-bottom: ($baseline/4); + + + &:last-child { + margin-bottom: 0; + border: none; + padding-bottom: 0; + } + } + } } } @@ -568,4 +584,14 @@ body.hide-wip { .wip-box { display: none; } +} + +// ==================== + +// needed fudges for now +body.dashboard { + + .my-classes { + margin-top: $baseline; + } } \ No newline at end of file diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index 68e1efc0b1..676914379c 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -63,7 +63,7 @@ .branding { position: relative; - margin: 0 ($baseline*0.75) 0 0; + margin: 0 ($baseline/2) 0 0; padding-right: ($baseline*0.75); a { @@ -120,6 +120,7 @@ width: 100%; max-width: 220px; overflow: hidden; + margin-top: -4px; white-space: nowrap; text-overflow: ellipsis; @include font-size(16); @@ -202,11 +203,17 @@ .account-username { display: inline-block; + vertical-align: middle; width: 80%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } + + .icon-expand { + display: inline-block; + vertical-align: middle; + } } } @@ -221,6 +228,7 @@ .icon-expand { @include font-size(14); @include transition (color 0.5s ease-in-out, opacity 0.5s ease-in-out); + display: inline-block; margin-left: 2px; opacity: 0.5; color: $gray-l2; @@ -305,7 +313,7 @@ .wrapper-nav-sub { top: 27px; left: auto; - right: -($baseline/2); + right: -13px; width: 110px; } diff --git a/cms/templates/settings.html b/cms/templates/settings.html index fb0be45a69..9200ea8d8e 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -153,7 +153,7 @@ from contentstore import utils

Introducing Your Course

- Information for perspective students + Information for prospective students
    @@ -218,6 +218,7 @@ from contentstore import utils % endif diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index 0e5b9df8af..9094676898 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -140,6 +140,7 @@ from contentstore import utils % endif diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 230c658f31..53c5193f3d 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -84,7 +84,7 @@