diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss index 8ed84ae2a7fd1aeb6a77a9c9fb2fafddd86d6d4e..98a45a2281f33611519a846598c947dbe4cdf638 100644 --- a/lms/static/sass/base/_variables.scss +++ b/lms/static/sass/base/_variables.scss @@ -225,9 +225,9 @@ $warning-color: $m-pink; $confirm-color: $m-green; // Notifications -$notify-banner-bg1: rgb(56,56,56); -$notify-banner-bg2: rgb(136,136,136); -$notify-banner-bg3: rgb(223,223,223); +$notify-banner-bg-1: rgb(56,56,56); +$notify-banner-bg-2: rgb(136,136,136); +$notify-banner-bg-3: rgb(223,223,223); $alert-color: rgb(212, 64, 64); //rich red $warning-color: rgb(237, 189, 60); //rich yellow diff --git a/lms/static/sass/elements/_system-feedback.scss b/lms/static/sass/elements/_system-feedback.scss index 963e8a2b59293e8dfd63af16cf952431e2d8edb7..5b041d0a56de47b61498d7f944d0020293574993 100644 --- a/lms/static/sass/elements/_system-feedback.scss +++ b/lms/static/sass/elements/_system-feedback.scss @@ -5,10 +5,15 @@ // UI : message .wrapper-msg { - box-shadow: 0 0 5px $shadow-d1 inset; + display: block; margin-bottom: ($baseline/4); + box-shadow: 0 0 5px $shadow-d1 inset; + background: $notify-banner-bg-1; padding: $baseline ($baseline*1.5); - background: $notify-banner-bg1; + + &.is-hidden { + display: none; + } // basic object .msg { @@ -84,13 +89,17 @@ border: none; text-shadow: none; color: inherit; + + &:hover { + color: $action-primary-bg; + } } } } // object variations &.urgency-high { - background: $notify-banner-bg1; + background: $notify-banner-bg-1; .msg { color: $white; @@ -98,7 +107,7 @@ } &.urgency-mid { - background: $notify-banner-bg2; + background: $notify-banner-bg-2; .msg { color: $white; @@ -106,7 +115,7 @@ } &.urgency-low { - background: $notify-banner-bg3; + background: $notify-banner-bg-3; .msg { color: $black; @@ -126,6 +135,7 @@ } } + // prompts // notifications diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index eed092e81a44e9465b0d1381b976df1d1dbeeaba..ef864cb39240c7197230fdb9afb65c6941f54382 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -171,11 +171,11 @@ } .course-name { + @include line-height(12); display: inline-block; vertical-align: top; width: 80%; color: inherit; - line-height: 1.4; } } } diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index b88a162aa6540d1fcdf724d643240506b43ff91c..fe337c556acaa297899e98302deb1e91b3161d83 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -1853,10 +1853,10 @@ } .reverify-status { + @extend %t-weight4; border-top: 1px solid $light-gray; background-color: $m-gray-l4; color: $success-color; - font-weight: 600; } } @@ -1872,10 +1872,10 @@ } .reverify-status { + @extend %t-weight4; border-top: 1px solid $light-gray; background-color: $m-gray-l4; color: $warning-color; - font-weight: 600; } } @@ -1891,10 +1891,10 @@ } .reverify-status { + @extend %t-weight4; border-top: 1px solid $light-gray; background-color: $m-gray-l4; color: $alert-color; - font-weight: 600; } } } @@ -2261,7 +2261,7 @@ //reverify notification special styles .msg-reverify { .reverify-list { - margin: 5px 0; + margin: ($baseline/4) 0; } } diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html index 5a7265533232f5170ed9f29b84d271baafa0503e..59eedd21c49e2ab39b1acda5c930698b1d227346 100644 --- a/lms/templates/courseware/progress.html +++ b/lms/templates/courseware/progress.html @@ -29,7 +29,6 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph", <%include file="/dashboard/_dashboard_prompt_midcourse_reverify.html" /> <%include file="/courseware/course_navigation.html" args="active_page='progress'" /> - <section class="container"> <div class="profile-wrapper"> diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 6461ab1a267dc1c22d5cf4c361e5b1339b59538e..a2104b5d7aea9e090822dc95ad24317583dad601 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -29,7 +29,7 @@ type: "post", data: { 'user_id': ${user.id}, } }) - $("#failed-verification-banner").css("display","none"); + $("#failed-verification-banner").addClass('is-hidden'); }) $("#upgrade-to-verified").click(function(event) { diff --git a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html index b4dd942579c09b702251e7b6d3324af3d270fc3b..f5d7fc274c9abca8786df9c187c09e2b7231c31b 100644 --- a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html +++ b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html @@ -12,7 +12,7 @@ <h2 class="title">${_("You need to re-verify to continue")}</h2> <div class="copy"> <p class="activation-message"> - ${_("To continue in the verified track in the following courses, you need to re-verify your identity:")} + ${_("To continue in the ID Verified track in the following courses, you need to re-verify your identity:")} </p> <ul class="reverify-list"> % for item in reverifications["must_reverify"]: @@ -41,7 +41,7 @@ % for item in reverifications["must_reverify"]: <div class="copy"> <p class='activation-message'> - ${_('To continue in the verified track in <strong>{course_name}</strong>, you need to re-verify your identity by {date}.').format(course_name=item.course_name, date=item.date)} + ${_('To continue in the ID Verified track in <strong>{course_name}</strong>, you need to re-verify your identity by {date}.').format(course_name=item.course_name, date=item.date)} </p> </div> </div> diff --git a/lms/templates/verify_student/midcourse_reverify_dash.html b/lms/templates/verify_student/midcourse_reverify_dash.html index a6fb256edbd43ab70fedcb94b5838cf55b468577..dd02604ba958df47430dd7e3c92d8932c2599636 100644 --- a/lms/templates/verify_student/midcourse_reverify_dash.html +++ b/lms/templates/verify_student/midcourse_reverify_dash.html @@ -14,7 +14,7 @@ <div class="wrapper-content-main"> <article class="content-main"> - <h2 class="title">${_("You are in the Verified track")}</h2> + <h2 class="title">${_("You are in the ID Verified track")}</h2> <div class="copy"> @@ -128,7 +128,7 @@ <div class="faq-item"> <h3 class="title faq-question">${_("What if I have trouble with my re-verification?")}</h3> <div class="copy faq-answer"> - <p>Because of the short time that re-verification is open, you <b>will not be able to correct a failed verification</b>. If you think there was an error in the review, please contact us at <a href="stuff">support@edx.org</a>.</p> + <p>Because of the short time that re-verification is open, you <strong>will not be able to correct a failed verification</strong>. If you think there was an error in the review, please contact us at <a href="stuff">support@edx.org</a>.</p> </div> </div> </div> diff --git a/lms/templates/verify_student/prompt_midcourse_reverify.html b/lms/templates/verify_student/prompt_midcourse_reverify.html index b16003664395ada2fd48273c68ecc2493eef30b3..36727b6af1a486a4ee052db3da5575a03e13f7e8 100644 --- a/lms/templates/verify_student/prompt_midcourse_reverify.html +++ b/lms/templates/verify_student/prompt_midcourse_reverify.html @@ -1,6 +1,6 @@ <%! from django.utils.translation import ugettext as _ %> <!--TODO replace this with something a clever deisgn person approves of--> -<h2>${_("You need to re-verify to continue")}</h2> +<h2 class="title">${_("You need to re-verify to continue")}</h2> <p class='activation-message'> - ${_("To continue in the verified track in {course}, you need to re-verify your identity by {date}. Go to URL.").format(email)} + ${_("To continue in the ID Verified track in {course}, you need to re-verify your identity by {date}. Go to URL.").format(email)} </p>