LMS: renaming Sass/CSS files for consistency and clarity

This commit is contained in:
Brian Talbot
2015-05-13 21:26:46 -04:00
parent 161d89a723
commit 2899885711
12 changed files with 30 additions and 30 deletions

8
.gitignore vendored
View File

@@ -74,10 +74,10 @@ bin/
lms/static/css/
lms/static/sass/*.css
lms/static/sass/*.css.map
lms/static/sass/application.scss
lms/static/sass/application-rtl.scss
lms/static/sass/course.scss
lms/static/sass/course-rtl.scss
lms/static/sass/lms-main.scss
lms/static/sass/lms-main-rtl.scss
lms/static/sass/lms-course.scss
lms/static/sass/lms-course-rtl.scss
cms/static/css/
cms/static/sass/*.css
cms/static/sass/*.css.map

View File

@@ -1269,19 +1269,19 @@ PIPELINE_CSS = {
],
'output_filename': 'css/lms-style-vendor-tinymce-skin.css',
},
'style-app': {
'style-main': {
'source_filenames': [
'sass/application.css',
'sass/lms-main.css',
'sass/ie.css'
],
'output_filename': 'css/lms-style-app.css',
'output_filename': 'css/lms-main.css',
},
'style-app-rtl': {
'style-main-rtl': {
'source_filenames': [
'sass/application-rtl.css',
'sass/lms-main-rtl.css',
'sass/ie-rtl.css'
],
'output_filename': 'css/lms-style-app-rtl.css',
'output_filename': 'css/lms-main-rtl.css',
},
'style-course-vendor': {
'source_filenames': [
@@ -1291,26 +1291,26 @@ PIPELINE_CSS = {
],
'output_filename': 'css/lms-style-course-vendor.css',
},
'style-course': {
'source_filenames': [
'sass/lms-course.css',
'xmodule/modules.css',
],
'output_filename': 'css/lms-course.css',
},
'style-course-rtl': {
'source_filenames': [
'sass/lms-course-rtl.css',
'xmodule/modules.css',
],
'output_filename': 'css/lms-course-rtl.css',
},
'style-student-notes': {
'source_filenames': [
'css/vendor/edxnotes/annotator.min.css',
],
'output_filename': 'css/lms-style-student-notes.css',
},
'style-course': {
'source_filenames': [
'sass/course.css',
'xmodule/modules.css',
],
'output_filename': 'css/lms-style-course.css',
},
'style-course-rtl': {
'source_filenames': [
'sass/course-rtl.css',
'xmodule/modules.css',
],
'output_filename': 'css/lms-style-course-rtl.css',
},
'style-xmodule-annotations': {
'source_filenames': [
'css/vendor/ova/annotator.css',

View File

@@ -4,6 +4,6 @@
*.swp
*.orig
*.DS_Store
application.css
style-main.css
ie.css
Gemfile.lock

View File

@@ -1,7 +1,7 @@
// ------------------------------
// LMS Courseware: Shared Build Compile
// About: Sass compile for the LMS Courseware Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
// About: Sass compile for the LMS Courseware Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the lms-course-*.scss files.
@import 'base/base';
@import 'base/extends';

View File

@@ -1,7 +1,7 @@
// ------------------------------
// LMS: Shared Build Compile
// About: Sass compile for the LMS Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the main-*.scss files.
// About: Sass compile for the LMS Elements that are shared between LTR and RTL UI. Configuration and vendor specific imports happen before this shared set of imports are compiled in the lms-main-*.scss files.
// base - assets
@import 'base/font_face';

View File

@@ -65,7 +65,7 @@
<link rel="icon" type="image/x-icon" href="${static.url(microsite.get_value('favicon_path', settings.FAVICON_PATH))}" />
<%static:css group='style-vendor'/>
<%static:css group='style-app'/>
<%static:css group='style-main'/>
% if disable_courseware_js:
<%static:js group='base_vendor'/>

View File

@@ -8,7 +8,7 @@
<link rel="icon" type="image/x-icon" href="{% favicon_path %}" />
{% compressed_css 'style-vendor' %}
{% compressed_css 'style-app' %}
{% compressed_css 'style-main' %}
{% compressed_css 'style-course-vendor' %}
{% compressed_css 'style-course' %}

View File

@@ -12,7 +12,7 @@
<meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
<%static:css group='style-vendor'/>
<%static:css group='style-app'/>
<%static:css group='style-main'/>
<%static:js group='base_vendor'/>
<!--[if lt IE 9]>