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
8
.gitignore
vendored
8
.gitignore
vendored
@@ -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
|
||||
|
||||
@@ -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': [
|
||||
|
||||
@@ -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*
|
||||
// ====================
|
||||
|
||||
@@ -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" />
|
||||
|
||||
|
||||
@@ -1272,19 +1272,17 @@ PIPELINE_CSS = {
|
||||
],
|
||||
'output_filename': 'css/lms-style-vendor-tinymce-skin.css',
|
||||
},
|
||||
'style-app': {
|
||||
'style-main': {
|
||||
'source_filenames': [
|
||||
'sass/application.css',
|
||||
'sass/ie.css'
|
||||
'sass/lms-main.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/ie-rtl.css'
|
||||
'sass/lms-main-rtl.css',
|
||||
],
|
||||
'output_filename': 'css/lms-style-app-rtl.css',
|
||||
'output_filename': 'css/lms-main-rtl.css',
|
||||
},
|
||||
'style-course-vendor': {
|
||||
'source_filenames': [
|
||||
@@ -1294,26 +1292,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',
|
||||
|
||||
2
lms/static/.gitignore
vendored
2
lms/static/.gitignore
vendored
@@ -4,6 +4,6 @@
|
||||
*.swp
|
||||
*.orig
|
||||
*.DS_Store
|
||||
application.css
|
||||
style-main.css
|
||||
ie.css
|
||||
Gemfile.lock
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -1,199 +0,0 @@
|
||||
@import "bourbon/bourbon";
|
||||
@import "base/variables";
|
||||
|
||||
// These are all quick solutions for IE please rewrite
|
||||
.ie {
|
||||
|
||||
//Make overlay white because ie doesn't like rgba
|
||||
.highlighted-courses .courses .course header.course-preview, .find-courses .courses .course header.course-preview,
|
||||
.home .highlighted-courses > h2, .home .highlighted-courses > section.outside-app h1, section.outside-app .home .highlighted-courses > h1,
|
||||
header.global {
|
||||
background: $white;
|
||||
}
|
||||
|
||||
// hide all actions
|
||||
.home > header .title .actions,
|
||||
.home > header .title:hover .actions,
|
||||
.home > header .title:focus .actions {
|
||||
display: none;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.home > header .title {
|
||||
&:hover, &:focus {
|
||||
|
||||
> hgroup {
|
||||
h1 {
|
||||
border-bottom: 0;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
h2 {
|
||||
opacity: 1.0;
|
||||
}
|
||||
}
|
||||
|
||||
.actions {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// because ie doesn't like :last
|
||||
.last {
|
||||
margin-right: 0 !important;
|
||||
}
|
||||
|
||||
// make partners not animate
|
||||
.home .university-partners .partners a {
|
||||
.name {
|
||||
position: static;
|
||||
}
|
||||
|
||||
&:hover, &:focus {
|
||||
text-decoration: none;
|
||||
|
||||
&::before {
|
||||
opacity: 1.0;
|
||||
}
|
||||
|
||||
.name {
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
img {
|
||||
top: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.home .university-partners .partners {
|
||||
width: 660px;
|
||||
|
||||
li.partner {
|
||||
float: left;
|
||||
display: block;
|
||||
padding: 0;
|
||||
width: 220px;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
// make animations on homepage not animate and show everything
|
||||
.highlighted-courses .courses .course, .find-courses .courses .course {
|
||||
.meta-info {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.inner-wrapper {
|
||||
height: 100%;
|
||||
overflow: visible;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
header.course-preview {
|
||||
left: 0px;
|
||||
position: relative;
|
||||
top: 0px;
|
||||
width: 100%;
|
||||
z-index: 3;
|
||||
height: auto;
|
||||
|
||||
hgroup {
|
||||
position: relative;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.info {
|
||||
height: auto;
|
||||
position: static;
|
||||
overflow: visible;
|
||||
|
||||
.desc {
|
||||
height: auto;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover, &:focus {
|
||||
background: rgb(245,245,245);
|
||||
border-color: rgb(170,170,170);
|
||||
box-shadow: 0 1px 16px 0 rgba($blue, 0.4);
|
||||
|
||||
.info {
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.meta-info {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// make overlay flat black since IE cant handle rgba
|
||||
#lean_overlay {
|
||||
background: $black;
|
||||
}
|
||||
|
||||
// active navigation
|
||||
nav.wrapper-course-material ol.course-tabs li a.active, nav.wrapper-course-material .xmodule_SequenceModule nav.sequence-nav ol.course-tabs li a.seq_video.active, .xmodule_SequenceModule nav.sequence-nav nav.wrapper-course-material ol.course-tabs li a.seq_video.active {
|
||||
background-color: #333;
|
||||
background-color: rgba(0, 0, 0, .4);
|
||||
}
|
||||
|
||||
// make dropdown user consistent size
|
||||
header.global ol.user > li.primary a.dropdown {
|
||||
padding-top: 6px;
|
||||
padding-bottom: 6px;
|
||||
}
|
||||
|
||||
// always hide arrow in IE
|
||||
.dashboard .my-courses .my-course .cover .arrow {
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.course-wrapper {
|
||||
display: block !important;
|
||||
|
||||
section.course-content,
|
||||
div.course-index {
|
||||
display: block !important;
|
||||
float: left;
|
||||
}
|
||||
|
||||
section.course-content {
|
||||
width: 71.27%;
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
float: left !important;
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
.sequence-nav ol {
|
||||
display: block !important;
|
||||
|
||||
li {
|
||||
float: left !important;
|
||||
width: 50px;
|
||||
}
|
||||
}
|
||||
|
||||
.course-wrapper {
|
||||
@include clearfix();
|
||||
}
|
||||
}
|
||||
|
||||
// ====================
|
||||
|
||||
// CASE: IE9
|
||||
.lte9 {
|
||||
|
||||
.ie-banner {
|
||||
display: block !important;
|
||||
}
|
||||
}
|
||||
@@ -63,7 +63,7 @@ dir_rtl = 'rtl' if get_language_bidi() else 'ltr'
|
||||
<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'/>
|
||||
|
||||
@@ -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' %}
|
||||
|
||||
|
||||
@@ -10,7 +10,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'/>
|
||||
|
||||
<%block name="headextra"/>
|
||||
|
||||
Reference in New Issue
Block a user