From 722ddb62d35b7a92fc4acea92f43ae852bc17995 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 12 Nov 2013 13:00:22 -0500 Subject: [PATCH] Studio: resolves IE notifications display issue and abstracts CSS to avoid IE selector/rule limit STUD-815 --- cms/envs/common.py | 6 +++ cms/static/sass/contexts/_ie.scss | 7 ++++ cms/static/sass/style-app-extend1.scss | 54 ++++++++++++++++++++++++++ cms/static/sass/style-app.scss | 25 ------------ cms/templates/base.html | 1 + 5 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 cms/static/sass/style-app-extend1.scss diff --git a/cms/envs/common.py b/cms/envs/common.py index 5d72556e52..40424c46a9 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -258,6 +258,12 @@ PIPELINE_CSS = { ], 'output_filename': 'css/cms-style-app.css', }, + 'style-app-extend1': { + 'source_filenames': [ + 'sass/style-app-extend1.css', + ], + 'output_filename': 'css/cms-style-app-extend1.css', + }, 'style-xmodule': { 'source_filenames': [ 'sass/style-xmodule.css', diff --git a/cms/static/sass/contexts/_ie.scss b/cms/static/sass/contexts/_ie.scss index 2f20548dfc..4599ec3e68 100644 --- a/cms/static/sass/contexts/_ie.scss +++ b/cms/static/sass/contexts/_ie.scss @@ -4,6 +4,13 @@ // CASE: less than or equal to IE9 .lte9 { + // CASE: IE9 doesn't support css animations and negative positioning + .wrapper-notification { + + &.is-shown { + bottom: 0; + } + } } // ==================== diff --git a/cms/static/sass/style-app-extend1.scss b/cms/static/sass/style-app-extend1.scss new file mode 100644 index 0000000000..0e19626aa5 --- /dev/null +++ b/cms/static/sass/style-app-extend1.scss @@ -0,0 +1,54 @@ +// studio - css architecture +// ==================== + +// libs and resets *do not edit* +@import 'bourbon/bourbon'; // lib - bourbon + +// VENDOR + REBASE *referenced/used vendor presentation and reset* +// ==================== +@import 'reset'; + +// BASE *default edX offerings* +// ==================== +// base - utilities +@import 'variables'; +@import 'mixins'; +@import 'mixins-inherited'; + +// base - assets +@import 'assets/fonts'; +@import 'assets/graphics'; // sprites, basic img/figure/svg styling +@import 'assets/anims'; // animations + +// base - starter +@import 'base'; + +// base - elements +@import 'elements/typography'; +@import 'elements/icons'; // references to icons used +@import 'elements/controls'; // buttons, link styles, sliders, etc. + +// base - specific views +@import 'views/account'; +@import 'views/assets'; +@import 'views/updates'; +@import 'views/dashboard'; +@import 'views/export'; +@import 'views/index'; +@import 'views/import'; +@import 'views/outline'; +@import 'views/settings'; +@import 'views/static-pages'; +@import 'views/subsection'; +@import 'views/unit'; +@import 'views/users'; +@import 'views/checklists'; +@import 'views/textbooks'; + +// base - contexts +@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs) + +// temp - inherited +@import 'assets/content-types'; + +@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/) diff --git a/cms/static/sass/style-app.scss b/cms/static/sass/style-app.scss index 48d8b9ce77..09409f779c 100644 --- a/cms/static/sass/style-app.scss +++ b/cms/static/sass/style-app.scss @@ -38,28 +38,3 @@ @import 'elements/modal'; // interstitial UI, dialogs, modal windows @import 'elements/vendor'; // overrides to vendor-provided styling @import 'elements/uploads'; - -// base - specific views -@import 'views/account'; -@import 'views/assets'; -@import 'views/updates'; -@import 'views/dashboard'; -@import 'views/export'; -@import 'views/index'; -@import 'views/import'; -@import 'views/outline'; -@import 'views/settings'; -@import 'views/static-pages'; -@import 'views/subsection'; -@import 'views/unit'; -@import 'views/users'; -@import 'views/checklists'; -@import 'views/textbooks'; - -// base - contexts -@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs) - -// temp - inherited -@import 'assets/content-types'; - -@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/) diff --git a/cms/templates/base.html b/cms/templates/base.html index 031006f818..37b25b1919 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -24,6 +24,7 @@ <%static:css group='style-vendor'/> <%static:css group='style-app'/> + <%static:css group='style-app-extend1'/> <%static:css group='style-xmodule'/> <%include file="widgets/segment-io.html" />