diff --git a/cms/envs/common.py b/cms/envs/common.py index 5d19e4d538..ddf9fe9801 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -465,36 +465,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-app-rtl': { 'source_filenames': [ 'sass/style-app-rtl.css', ], 'output_filename': 'css/cms-style-app-rtl.css', }, - 'style-app-extend1-rtl': { - 'source_filenames': [ - 'sass/style-app-extend1-rtl.css', - ], - 'output_filename': 'css/cms-style-app-extend1-rtl.css', - }, - 'style-xmodule': { - 'source_filenames': [ - 'sass/style-xmodule.css', - ], - 'output_filename': 'css/cms-style-xmodule.css', - }, - 'style-xmodule-rtl': { - 'source_filenames': [ - 'sass/style-xmodule-rtl.css', - ], - 'output_filename': 'css/cms-style-xmodule-rtl.css', - }, 'style-xmodule-annotations': { 'source_filenames': [ 'css/vendor/ova/annotator.css', diff --git a/cms/static/sass/style-app-extend1-rtl.scss b/cms/static/sass/style-app-extend1-rtl.scss deleted file mode 100644 index 542483e4b5..0000000000 --- a/cms/static/sass/style-app-extend1-rtl.scss +++ /dev/null @@ -1,78 +0,0 @@ -// studio - css architecture -// ==================== - -// Table of Contents -// * +Libs and Resets -// * +Vendor and Rebase -// * +Base - Utilities -// * +Base - Assets -// * +Base - Starter -// * +Base - Elements -// * +Base - Specific Views -// * +Base - Contexts - - -// +Libs and Resets - *do not edit* -// ==================== -@import 'bourbon/bourbon'; // lib - bourbon -@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages - -// +Vendor and Rebase - *referenced/used vendor presentation and reset* -// ==================== -@import 'reset'; - -// +Base - Utilities -// ==================== -@import 'variables'; -@import 'mixins'; -@import 'mixins-inherited'; - -// +Base - Assets -// ==================== -@import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic image/figure/svg styling -@import 'assets/anims'; // animations - -// +Base - Starter -// ==================== -@import 'base'; - -// +Base - Elements -// ==================== -@import 'elements/typography'; -@import 'elements/pagination'; // pagination -@import 'elements/icons'; // references to icons used -@import 'elements/controls'; // buttons, link styles, sliders, etc. -@import 'elements/xblocks'; // studio rendering chrome for xblocks -@import 'elements/modules'; // content module patterns -@import 'elements/layout'; // various standard layouts -@import 'elements/uploaded-assets'; // layout for asset tables - -// +Base - Specific Views -// ==================== -@import 'views/account'; -@import 'views/assets'; -@import 'views/updates'; -@import 'views/dashboard'; -@import 'views/export'; -@import 'views/index'; -@import 'views/course-create'; -@import 'views/import'; -@import 'views/outline'; -@import 'views/settings'; -@import 'views/static-pages'; -@import 'views/unit'; -@import 'views/container'; -@import 'views/users'; -@import 'views/checklists'; -@import 'views/textbooks'; -@import 'views/export-git'; -@import 'views/group-configuration'; -@import 'views/video-upload'; - -// +Base - Contexts -// ==================== -@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs) - -@import 'developer'; // used for any developer-created scss that needs further polish/refactoring -@import 'shame'; // used for any bad-form/orphaned scss diff --git a/cms/static/sass/style-app-extend1.scss b/cms/static/sass/style-app-extend1.scss deleted file mode 100644 index 13efe1702d..0000000000 --- a/cms/static/sass/style-app-extend1.scss +++ /dev/null @@ -1,78 +0,0 @@ -// studio - css architecture -// ==================== - -// Table of Contents -// * +Libs and Resets -// * +Vendor and Rebase -// * +Base - Utilities -// * +Base - Assets -// * +Base - Starter -// * +Base - Elements -// * +Base - Specific Views -// * +Base - Contexts - - -// +Libs and Resets - *do not edit* -// ==================== -@import 'bourbon/bourbon'; // lib - bourbon -@import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages - -// +Vendor and Rebase - *referenced/used vendor presentation and reset* -// ==================== -@import 'reset'; - -// +Base - Utilities -// ==================== -@import 'variables'; -@import 'mixins'; -@import 'mixins-inherited'; - -// +Base - Assets -// ==================== -@import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic image/figure/svg styling -@import 'assets/anims'; // animations - -// +Base - Starter -// ==================== -@import 'base'; - -// +Base - Elements -// ==================== -@import 'elements/typography'; -@import 'elements/pagination'; // pagination -@import 'elements/icons'; // references to icons used -@import 'elements/controls'; // buttons, link styles, sliders, etc. -@import 'elements/xblocks'; // studio rendering chrome for xblocks -@import 'elements/modules'; // content module patterns -@import 'elements/layout'; // various standard layouts -@import 'elements/uploaded-assets'; // layout for asset tables - -// +Base - Specific Views -// ==================== -@import 'views/account'; -@import 'views/assets'; -@import 'views/updates'; -@import 'views/dashboard'; -@import 'views/export'; -@import 'views/index'; -@import 'views/course-create'; -@import 'views/import'; -@import 'views/outline'; -@import 'views/settings'; -@import 'views/static-pages'; -@import 'views/unit'; -@import 'views/container'; -@import 'views/users'; -@import 'views/checklists'; -@import 'views/textbooks'; -@import 'views/export-git'; -@import 'views/group-configuration'; -@import 'views/video-upload'; - -// +Base - Contexts -// ==================== -@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs) - -@import 'developer'; // used for any developer-created scss that needs further polish/refactoring -@import 'shame'; // used for any bad-form/orphaned scss diff --git a/cms/static/sass/style-app-rtl.scss b/cms/static/sass/style-app-rtl.scss index ff9b6814cf..7dddaa7f3c 100644 --- a/cms/static/sass/style-app-rtl.scss +++ b/cms/static/sass/style-app-rtl.scss @@ -1,44 +1,49 @@ // studio - css architecture // ==================== -// Table of Contents +// Table of Contents // * +Libs and Resets -// * +Vendor and Rebase +// * +Vendor and Rebase // * +Base - Utilities // * +Base - Assets // * +Base - Starter // * +Base - Elements +// * +Base - Specific Views +// * +Base - Contexts +// * +Xmodule // +Libs and Resets - *do not edit* -// ==================== +// ==================== @import 'bourbon/bourbon'; // lib - bourbon @import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages // +Vendor and Rebase - *referenced/used vendor presentation and reset* -// ==================== +// ==================== @import 'reset'; // +Base - Utilities -// ==================== +// ==================== @import 'variables'; @import 'mixins'; @import 'mixins-inherited'; // +Base - Assets -// ==================== +// ==================== @import 'assets/fonts'; @import 'assets/graphics'; // sprites, basic image/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. +@import 'elements/pagination'; // pagination +@import 'elements/xblocks'; // studio rendering chrome for xblocks @import 'elements/modules'; // content module patterns @import 'elements/navigation'; // all archetypes of navigation @import 'elements/layout'; // various standard layouts @@ -52,3 +57,40 @@ @import 'elements/modal'; // interstitial UI, dialogs, modal windows @import 'elements/vendor'; // overrides to vendor-provided styling @import 'elements/modal-window'; +@import 'elements/uploaded-assets'; // layout for asset tables + +// +Base - Specific Views +// ==================== +@import 'views/account'; +@import 'views/assets'; +@import 'views/updates'; +@import 'views/dashboard'; +@import 'views/export'; +@import 'views/index'; +@import 'views/course-create'; +@import 'views/import'; +@import 'views/outline'; +@import 'views/settings'; +@import 'views/static-pages'; +@import 'views/unit'; +@import 'views/container'; +@import 'views/users'; +@import 'views/checklists'; +@import 'views/textbooks'; +@import 'views/export-git'; +@import 'views/group-configuration'; +@import 'views/video-upload'; + +// +Base - Contexts +// ==================== +@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs) + +// +Xmodule +// ==================== +@import 'xmodule/modules/css/module-styles.scss'; +@import 'xmodule/descriptors/css/module-styles.scss'; +@import 'elements/xmodules'; // styling for Studio-specific contexts + +@import 'developer'; // used for any developer-created scss that needs further polish/refactoring +@import 'shame'; // used for any bad-form/orphaned scss + diff --git a/cms/static/sass/style-app.scss b/cms/static/sass/style-app.scss index 3bca8305ff..169c3762b5 100644 --- a/cms/static/sass/style-app.scss +++ b/cms/static/sass/style-app.scss @@ -1,44 +1,49 @@ // studio - css architecture // ==================== -// Table of Contents +// Table of Contents // * +Libs and Resets -// * +Vendor and Rebase +// * +Vendor and Rebase // * +Base - Utilities // * +Base - Assets // * +Base - Starter // * +Base - Elements +// * +Base - Specific Views +// * +Base - Contexts +// * +Xmodule // +Libs and Resets - *do not edit* -// ==================== +// ==================== @import 'bourbon/bourbon'; // lib - bourbon @import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages // +Vendor and Rebase - *referenced/used vendor presentation and reset* -// ==================== +// ==================== @import 'reset'; // +Base - Utilities -// ==================== +// ==================== @import 'variables'; @import 'mixins'; @import 'mixins-inherited'; // +Base - Assets -// ==================== +// ==================== @import 'assets/fonts'; @import 'assets/graphics'; // sprites, basic image/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. +@import 'elements/pagination'; // pagination +@import 'elements/xblocks'; // studio rendering chrome for xblocks @import 'elements/modules'; // content module patterns @import 'elements/navigation'; // all archetypes of navigation @import 'elements/layout'; // various standard layouts @@ -52,3 +57,39 @@ @import 'elements/modal'; // interstitial UI, dialogs, modal windows @import 'elements/vendor'; // overrides to vendor-provided styling @import 'elements/modal-window'; +@import 'elements/uploaded-assets'; // layout for asset tables + +// +Base - Specific Views +// ==================== +@import 'views/account'; +@import 'views/assets'; +@import 'views/updates'; +@import 'views/dashboard'; +@import 'views/export'; +@import 'views/index'; +@import 'views/course-create'; +@import 'views/import'; +@import 'views/outline'; +@import 'views/settings'; +@import 'views/static-pages'; +@import 'views/unit'; +@import 'views/container'; +@import 'views/users'; +@import 'views/checklists'; +@import 'views/textbooks'; +@import 'views/export-git'; +@import 'views/group-configuration'; +@import 'views/video-upload'; + +// +Base - Contexts +// ==================== +@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs) + +// +Xmodule +// ==================== +@import 'xmodule/modules/css/module-styles.scss'; +@import 'xmodule/descriptors/css/module-styles.scss'; +@import 'elements/xmodules'; // styling for Studio-specific contexts + +@import 'developer'; // used for any developer-created scss that needs further polish/refactoring +@import 'shame'; // used for any bad-form/orphaned scss diff --git a/cms/static/sass/style-xmodule-rtl.scss b/cms/static/sass/style-xmodule-rtl.scss deleted file mode 100644 index f5e3379acc..0000000000 --- a/cms/static/sass/style-xmodule-rtl.scss +++ /dev/null @@ -1,50 +0,0 @@ -// studio - xmodule architecture -// ==================== - -// Table of Contents -// * +Libs and Resets -// * +Vendor and Rebase -// * +Base - Utilities -// * +Base - Assets -// * +Base - Starter -// * +Base - Elements -// * +Xmodule - - -// +Libs and Resets - *do not edit* -// ==================== -@import 'bourbon/bourbon'; // lib - bourbon -@import 'vendor/bi-app/bi-app-rtl'; // set the layout for right to left languages - -// +Vendor and Rebase - *referenced/used vendor presentation and reset* -// ==================== -@import 'reset'; - -// +Base - Utilities -// ==================== -@import 'variables'; -@import 'mixins'; -@import 'mixins-inherited'; - -// +Base - Assets -// ==================== -@import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic image/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. -@import 'elements/navigation'; // all archetypes of navigation - -// +Xmodule -// ==================== -@import 'xmodule/modules/css/module-styles.scss'; -@import 'xmodule/descriptors/css/module-styles.scss'; -@import 'elements/xmodules'; // styling for Studio-specific contexts diff --git a/cms/static/sass/style-xmodule.scss b/cms/static/sass/style-xmodule.scss deleted file mode 100644 index d083a749a6..0000000000 --- a/cms/static/sass/style-xmodule.scss +++ /dev/null @@ -1,49 +0,0 @@ -// studio - xmodule architecture -// ==================== - -// Table of Contents -// * +Libs and Resets -// * +Vendor and Rebase -// * +Base - Utilities -// * +Base - Assets -// * +Base - Starter -// * +Base - Elements -// * +Xmodule - -// +Libs and Resets - *do not edit* -// ==================== -@import 'bourbon/bourbon'; // lib - bourbon -@import 'vendor/bi-app/bi-app-ltr'; // set the layout for left to right languages - -// +Vendor and Rebase - *referenced/used vendor presentation and reset* -// ==================== -@import 'reset'; - -// +Base - Utilities -// ==================== -@import 'variables'; -@import 'mixins'; -@import 'mixins-inherited'; - -// +Base - Assets -// ==================== -@import 'assets/fonts'; -@import 'assets/graphics'; // sprites, basic image/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. -@import 'elements/navigation'; // all archetypes of navigation - -// +Xmodule -// ==================== -@import 'xmodule/modules/css/module-styles.scss'; -@import 'xmodule/descriptors/css/module-styles.scss'; -@import 'elements/xmodules'; // styling for Studio-specific contexts diff --git a/cms/templates/base.html b/cms/templates/base.html index 607aa2024c..049450ca09 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -37,8 +37,6 @@ import json <%static:css group='style-vendor-tinymce-content'/> <%static:css group='style-vendor-tinymce-skin'/> <%static:css group='style-app'/> - <%static:css group='style-app-extend1'/> - <%static:css group='style-xmodule'/> <%include file="widgets/segment-io.html" />