diff --git a/lms/static/images/large-white-error-icon.png b/lms/static/images/large-white-error-icon.png deleted file mode 100644 index 9216260f48..0000000000 Binary files a/lms/static/images/large-white-error-icon.png and /dev/null differ diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss index 460e2dbc2d..4f3709d4ca 100644 --- a/lms/static/sass/_build-lms-v1.scss +++ b/lms/static/sass/_build-lms-v1.scss @@ -70,7 +70,7 @@ @import 'search/search'; // news -@import 'news'; +@import 'notifications'; @import 'mixins'; @import 'mixins-inherited'; diff --git a/lms/static/sass/_build-lms-v2.scss b/lms/static/sass/_build-lms-v2.scss index 5360669b1c..e12692dd48 100644 --- a/lms/static/sass/_build-lms-v2.scss +++ b/lms/static/sass/_build-lms-v2.scss @@ -18,3 +18,5 @@ @import 'shared-v2/components'; @import 'shared-v2/modal'; @import 'shared-v2/help-tab'; + +@import 'notifications'; diff --git a/lms/static/sass/_news.scss b/lms/static/sass/_news.scss deleted file mode 100644 index d5f31a1b3b..0000000000 --- a/lms/static/sass/_news.scss +++ /dev/null @@ -1,21 +0,0 @@ -@mixin news-font { - font-family: inherit; -} - -.notifications { - @include news-font; - font-size: 0.9em; - padding-left: $baseline; - padding-top: $baseline; - padding-bottom: $baseline; - - .notification { - @include news-font; - margin-top: ($baseline*0.75); - margin-bottom: ($baseline*0.75); - - a { - @include news-font; - } - } -} diff --git a/lms/static/sass/_notifications.scss b/lms/static/sass/_notifications.scss new file mode 100644 index 0000000000..0155ee3392 --- /dev/null +++ b/lms/static/sass/_notifications.scss @@ -0,0 +1,49 @@ +@mixin news-font { + font-family: inherit; +} + +.notifications { + @include news-font; + font-size: 0.9em; + padding-left: $baseline; + padding-top: $baseline; + padding-bottom: $baseline; + + .notification { + @include news-font; + margin-top: ($baseline*0.75); + margin-bottom: ($baseline*0.75); + + a { + @include news-font; + } + } +} + +.site-status { + @include linear-gradient(top, $shadow-l1, rgba(0, 0, 0, .0)); + padding: ($baseline / 2); + background-color: $site-status-color; + box-shadow: 0 -1px 0 rgba(0, 0, 0, .3) inset; + font-size: 14px; + + .icon { + @include margin-right($baseline / 2); + @include float(left); + color: $white !important; // some pages have color inherit + font-size: 18px; + } + + .inner-wrapper { + margin: auto; + max-width: 1180px; + min-width: 760px; + } + + p { + margin-bottom: 0; + line-height: 1.3; + color: $white !important; // some pages have color inherit + } +} + diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index e5d4a2c1e8..8585e8fe00 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -195,37 +195,6 @@ mark { color: #333; } -.site-status { - display: none; - padding: ($baseline/2); - @include linear-gradient(top, $shadow-l1, rgba(0, 0, 0, .0)); - background-color: $site-status-color; - box-shadow: 0 -1px 0 rgba(0, 0, 0, .3) inset; - font-size: 14px; - - .white-error-icon { - position: relative; - top: -4px; - float: left; - display: block; - width: 27px; - height: 24px; - margin-right: ($baseline*0.75); - background: url('#{$static-path}/images/large-white-error-icon.png') no-repeat; - } - - .inner-wrapper { - margin: auto; - max-width: 1180px; - min-width: 760px; - } - - p { - line-height: 1.3; - color: $white; - } -} - .ie-banner { display: none; max-width: 1140px; diff --git a/lms/static/sass/discussion/_build.scss b/lms/static/sass/discussion/_build.scss index 299d6f3c84..4b104caffb 100644 --- a/lms/static/sass/discussion/_build.scss +++ b/lms/static/sass/discussion/_build.scss @@ -40,3 +40,6 @@ $static-path: '../..' !default; @import 'views/inline'; @import 'utilities/developer'; @import 'utilities/shame'; + +// Site status banner +@import '../notifications'; diff --git a/lms/static/sass/shared-v2/_base.scss b/lms/static/sass/shared-v2/_base.scss index e3354f11bf..dc4d73e39d 100644 --- a/lms/static/sass/shared-v2/_base.scss +++ b/lms/static/sass/shared-v2/_base.scss @@ -22,3 +22,4 @@ .sr { @extend .sr-only; } + diff --git a/lms/static/sass/shared-v2/_variables.scss b/lms/static/sass/shared-v2/_variables.scss index 8457e6344d..0c0b6d01df 100644 --- a/lms/static/sass/shared-v2/_variables.scss +++ b/lms/static/sass/shared-v2/_variables.scss @@ -19,3 +19,7 @@ $light-grey-solid: rgba(200,200,200, 1); // Icons $lms-dark-icon-color: $white; $lms-dark-icon-background-color: palette(grayscale, black); + +$site-status-color: rgb(182,37,103); + +$shadow-l1: rgba(0,0,0,0.1) !default; diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index 44af1f7308..80e11e3d09 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -41,7 +41,7 @@ site_status_msg = get_site_status_msg(course_id) % if site_status_msg:
- +

${site_status_msg}