From 62db7a82a1f1eb17848ae51199a9e1c3656f7fb2 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 26 Sep 2014 16:45:32 -0400 Subject: [PATCH] converting instructor dashboard message UI to use .is-hidden vs.is-shown stateful CSS classes --- .../sass/course/instructor/_instructor_2.scss | 23 ++++--------------- .../notification.underscore | 2 +- .../instructor_dashboard/membership.html | 10 ++++---- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index 518c6ac0e0..82d2628936 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -51,10 +51,6 @@ .copy { font-weight: 600; } - - &.is-shown { - display: block; - } } // TYPE: warning @@ -63,10 +59,6 @@ background: tint($warning-color,95%); display: none; color: $warning-color; - - &.is-shown { - display: block; - } } // TYPE: confirm @@ -75,10 +67,6 @@ background: tint($confirm-color,95%); display: none; color: $confirm-color; - - &.is-shown { - display: block; - } } // TYPE: confirm @@ -89,10 +77,6 @@ .copy { color: $error-color; } - - &.is-shown { - display: block; - } } // inline copy @@ -224,12 +208,13 @@ section.instructor-dashboard-content-2 { // messages .message { margin-bottom: $baseline; - display: none; + display: block; border-radius: 1px; padding: ($baseline*0.75) $baseline; - &.is-shown { - display: block; + // CASE: is hidden + &.is-hidden { + display: none; } } diff --git a/lms/templates/instructor/instructor_dashboard_2/notification.underscore b/lms/templates/instructor/instructor_dashboard_2/notification.underscore index 5e9774b9c6..39298c94b5 100644 --- a/lms/templates/instructor/instructor_dashboard_2/notification.underscore +++ b/lms/templates/instructor/instructor_dashboard_2/notification.underscore @@ -1,4 +1,4 @@ -
+

<%- title %>

diff --git a/lms/templates/ux/reference/instructor_dashboard/membership.html b/lms/templates/ux/reference/instructor_dashboard/membership.html index 4de3dff1b0..d95050cf7d 100644 --- a/lms/templates/ux/reference/instructor_dashboard/membership.html +++ b/lms/templates/ux/reference/instructor_dashboard/membership.html @@ -285,7 +285,7 @@
-
+

There's currently an error with your cohorts configuration within this course.

@@ -352,11 +352,11 @@
-
+

New Cohort Name has been created. You can manually add students to this group below.

-
+

Special characters are not allowed in cohort group names

@@ -406,7 +406,7 @@
-
+

2,546 students have been added to this cohort group

@@ -419,7 +419,7 @@
-
+

There were 25 errors when trying to add students: