Merge pull request #8035 from edx/talbs/sass+css-file-names

LMS/Studio: Sync Up Sass/CSS/Pipeline Names
This commit is contained in:
Brian Talbot
2015-05-18 10:43:17 -04:00
18 changed files with 38 additions and 239 deletions

View File

@@ -462,17 +462,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': [

View File

@@ -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*
// ====================

View File

@@ -31,7 +31,7 @@ dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
<%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" />