From 903115d6a929bbed557f4d0eb177719a3f42ee8a Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 7 Feb 2013 11:07:18 -0500 Subject: [PATCH 1/4] studio - soft landing: refined user icon vs. dropdown icon styles --- cms/static/sass/_header.scss | 7 +++++++ cms/templates/widgets/header.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index c619eb8c19..fc69690379 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -204,6 +204,13 @@ nav .nav-item { .nav-account-username { width: 100%; + .icon-user { + display: inline-block; + vertical-align: middle; + margin-right: 3px; + @include font-size(12); + } + .account-username { display: inline-block; width: 80%; diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index cea96cb755..86687b0df7 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -75,7 +75,7 @@
  • ▾ From fedd0aac9aae1cbaae2c7d4a9435a336d9384710 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 7 Feb 2013 11:25:11 -0500 Subject: [PATCH 2/4] studio - course nav: added in styling to account for stateful menus --- cms/static/sass/_header.scss | 45 ++++++++++++++++++++++++------- cms/templates/asset_index.html | 2 +- cms/templates/export.html | 2 +- cms/templates/import.html | 2 +- cms/templates/manage_users.html | 2 +- cms/templates/widgets/header.html | 20 +++++++------- 6 files changed, 49 insertions(+), 24 deletions(-) diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss index fc69690379..c0793bcb8a 100644 --- a/cms/static/sass/_header.scss +++ b/cms/static/sass/_header.scss @@ -172,14 +172,6 @@ nav .nav-item { } } - // current state - &.is-current { - - .title, .icon-expanded { - color: $blue; - } - } - // specific nav items &.nav-course-courseware { } @@ -480,14 +472,47 @@ nav .nav-item { // ==================== // STATE: active/current nav states + +.nav-item.is-current, body.howitworks .nav-not-signedin-hiw, body.signin .nav-not-signedin-signin, body.signup .nav-not-signedin-signup, -body.course.outline .nav-course-courseware + +// course content +body.course.outline .nav-course-courseware .title, +body.course.updates .nav-course-courseware .title, +body.course.pages .nav-course-courseware .title, +body.course.uploads .nav-course-courseware .title, + +body.course.outline .nav-course-courseware-outline, +body.course.updates .nav-course-courseware-updates, +body.course.pages .nav-course-courseware-pages, +body.course.uploads .nav-course-courseware-uploads, + +// course settings +body.course.schedule .nav-course-settings .title, +body.course.grading .nav-course-settings .title, +body.course.team .nav-course-settings .title, +body.course.advanced .nav-course-settings .title, + +body.course.schedule .nav-course-settings-schedule, +body.course.grading .nav-course-settings-grading, +body.course.team .nav-course-settings-team, +body.course.advanced .nav-course-settings-advanced, + +// course tools +body.course.import .nav-course-tools .title, +body.course.export .nav-course-tools .title, + +body.course.import .nav-course-tools-import, +body.course.export .nav-course-tools-export, + { + color: $blue !important; + a { - color: $blue; + color: $blue !important; } } diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 01766e2dac..b4497f29dd 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -1,6 +1,6 @@ <%inherit file="base.html" /> <%! from django.core.urlresolvers import reverse %> -<%block name="bodyclass">assets +<%block name="bodyclass">is-signedin course uploads <%block name="title">Courseware Assets <%namespace name='static' file='static_content.html'/> diff --git a/cms/templates/export.html b/cms/templates/export.html index 37210934f6..bce5c968e0 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -3,7 +3,7 @@ <%! from django.core.urlresolvers import reverse %> <%block name="title">Export -<%block name="bodyclass">is-signedin course export +<%block name="bodyclass">is-signedin course tools export <%block name="content">
    diff --git a/cms/templates/import.html b/cms/templates/import.html index 17df308d3b..503eea37ee 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -3,7 +3,7 @@ <%! from django.core.urlresolvers import reverse %> <%block name="title">Import -<%block name="bodyclass">is-signedin course import +<%block name="bodyclass">is-signedin course tools import <%block name="content">
    diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html index 3af4a80623..49d4bf5ea1 100644 --- a/cms/templates/manage_users.html +++ b/cms/templates/manage_users.html @@ -1,6 +1,6 @@ <%inherit file="base.html" /> <%block name="title">Course Staff Manager -<%block name="bodyclass">is-signedin course users team +<%block name="bodyclass">is-signedin course users settings team <%block name="content"> diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html index 86687b0df7..7427344729 100644 --- a/cms/templates/widgets/header.html +++ b/cms/templates/widgets/header.html @@ -26,10 +26,10 @@
    @@ -41,10 +41,10 @@
    @@ -56,8 +56,8 @@
    From 5b9609abf63c7ffb27dd50824c70d9977127eb6c Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Thu, 7 Feb 2013 14:09:47 -0500 Subject: [PATCH 3/4] studio - soft landing: various fixes/tweaks --- cms/static/js/base.js | 2 +- cms/static/sass/_cms_mixins.scss | 4 ++-- cms/static/sass/_header.scss | 32 ++++++++++++++++++++++--------- cms/templates/widgets/footer.html | 2 +- cms/templates/widgets/header.html | 6 +++--- 5 files changed, 30 insertions(+), 16 deletions(-) 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 @@