From d09d0a2c36d3986f45e17f7d8f521f73a7776fc8 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 13 May 2015 21:46:39 -0400 Subject: [PATCH] Studio: renaming Sass/CSS files for consistency and clarity --- cms/envs/common.py | 12 ++++++------ cms/static/sass/_build.scss | 2 +- .../{style-app-rtl.scss => studio-main-rtl.scss} | 0 cms/static/sass/{style-app.scss => studio-main.scss} | 0 cms/templates/base.html | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename cms/static/sass/{style-app-rtl.scss => studio-main-rtl.scss} (100%) rename cms/static/sass/{style-app.scss => studio-main.scss} (100%) diff --git a/cms/envs/common.py b/cms/envs/common.py index ddf9fe9801..78d6e7bf35 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -459,17 +459,17 @@ PIPELINE_CSS = { ], 'output_filename': 'css/cms-style-vendor-tinymce-skin.css', }, - 'style-app': { + 'style-main': { 'source_filenames': [ - 'sass/style-app.css', + 'sass/studio-main.css', ], - 'output_filename': 'css/cms-style-app.css', + 'output_filename': 'css/studio-main.css', }, - 'style-app-rtl': { + 'style-main-rtl': { 'source_filenames': [ - 'sass/style-app-rtl.css', + 'sass/studio-main-rtl.css', ], - 'output_filename': 'css/cms-style-app-rtl.css', + 'output_filename': 'css/studio-main-rtl.css', }, 'style-xmodule-annotations': { 'source_filenames': [ diff --git a/cms/static/sass/_build.scss b/cms/static/sass/_build.scss index 34b778e4b8..2ecf8085b2 100644 --- a/cms/static/sass/_build.scss +++ b/cms/static/sass/_build.scss @@ -1,7 +1,7 @@ // ------------------------------ // Studio: Shared Build Compile -// About: Sass compile for Studio that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the style-app-*.scss files. +// About: Sass compile for Studio that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the studio-main-*.scss files. // +Vendor and Rebase - *referenced/used vendor presentation and reset* // ==================== diff --git a/cms/static/sass/style-app-rtl.scss b/cms/static/sass/studio-main-rtl.scss similarity index 100% rename from cms/static/sass/style-app-rtl.scss rename to cms/static/sass/studio-main-rtl.scss diff --git a/cms/static/sass/style-app.scss b/cms/static/sass/studio-main.scss similarity index 100% rename from cms/static/sass/style-app.scss rename to cms/static/sass/studio-main.scss diff --git a/cms/templates/base.html b/cms/templates/base.html index 049450ca09..c9f1d3d549 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -36,7 +36,7 @@ import json <%static:css group='style-vendor'/> <%static:css group='style-vendor-tinymce-content'/> <%static:css group='style-vendor-tinymce-skin'/> - <%static:css group='style-app'/> + <%static:css group='style-main'/> <%include file="widgets/segment-io.html" />