Skip to content

LMS: Revised CSS Architecture (resolves LMS_1020) #1208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
talbs wants to merge 5 commits into from
Closed

LMS: Revised CSS Architecture (resolves LMS_1020) #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d89cd0
LMS: revises CSS reference/pipeline architecture to handle IE9 select…
talbs Oct 2, 2013
54a3045
LMS: reverts Sass/CSS pipeline back to producing just one application…
talbs Oct 3, 2013
85814af
LMS: corrects indentation issue in hint_manager.html template
talbs Oct 11, 2013
ce204f3
LMS: removes ie-fixes static:css group from all template references
talbs Oct 11, 2013
86ef18b
LMS: removes error on <html> element syntax for iframed register buttons
talbs Oct 15, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions lms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@

# catches any uncaught RateLimitExceptions and returns a 403 instead of a 500
'ratelimitbackend.middleware.RateLimitMiddleware',

# For A/B testing
'waffle.middleware.WaffleMiddleware',
)
Expand Down Expand Up @@ -628,25 +628,37 @@
notes_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/notes/**/*.coffee'))

PIPELINE_CSS = {
'application': {
'source_filenames': ['sass/application.css'],
'output_filename': 'css/lms-application.css',
'style-vendor': {
'source_filenames': [
'css/vendor/font-awesome.css',
'css/vendor/jquery.qtip.min.css',
'css/vendor/responsive-carousel/responsive-carousel',
'css/vendor/responsive-carousel/responsive-carousel.slide',
],
'output_filename': 'css/lms-style-vendor.css',
},
'course': {
'style-app': {
'source_filenames': [
'sass/application.css',
'sass/ie.css'
],
'output_filename': 'css/lms-style-app.css',
},
'style-course-vendor': {
'source_filenames': [
'js/vendor/CodeMirror/codemirror.css',
'css/vendor/jquery.treeview.css',
'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
'css/vendor/jquery.qtip.min.css',
'css/vendor/annotator.min.css',
],
'output_filename': 'css/lms-style-course-vendor.css',
},
'style-course': {
'source_filenames': [
'sass/course.css',
'xmodule/modules.css',
],
'output_filename': 'css/lms-course.css',
},
'ie-fixes': {
'source_filenames': ['sass/ie.css'],
'output_filename': 'css/lms-ie.css',
'output_filename': 'css/lms-style-course.css',
},
}

Expand Down
5 changes: 1 addition & 4 deletions lms/static/sass/application.scss.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon

// VENDOR + REBASE *referenced/used vendor presentation and reset*
// RESET
// ====================

@import 'base/reset';
@import 'vendor/font-awesome';
@import 'vendor/responsive-carousel/responsive-carousel';
@import 'vendor/responsive-carousel/responsive-carousel.slide';

// BASE *default edX offerings*
// ====================
Expand Down
89 changes: 89 additions & 0 deletions lms/static/sass/elements/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,92 @@
%t-weight5 {
font-weight: 700;
}

// ====================

// MISC: extends - type
// application: canned headings
%hd-lv1 {
@extend %t-title1;
@extend %t-weight1;
color: $m-gray-d4;
margin: 0 0 ($baseline*2) 0;
}

%hd-lv2 {
@extend %t-title4;
@extend %t-weight1;
margin: 0 0 ($baseline*0.75) 0;
border-bottom: 1px solid $m-gray-l3;
padding-bottom: ($baseline/2);
color: $m-gray-d4;
}

%hd-lv3 {
@extend %t-title6;
@extend %t-weight4;
margin: 0 0 ($baseline/4) 0;
color: $m-gray-d4;
}

%hd-lv4 {
@extend %t-title6;
@extend %t-weight2;
margin: 0 0 $baseline 0;
color: $m-gray-d4;
}

%hd-lv5 {
@extend %t-title7;
@extend %t-weight4;
margin: 0 0 ($baseline/4) 0;
color: $m-gray-d4;
}

// application: canned copy
%copy-base {
@extend %t-copy-base;
color: $m-gray-d2;
}

%copy-lead1 {
@extend %t-copy-lead2;
color: $m-gray;
}

%copy-detail {
@extend %t-copy-sub1;
@extend %t-weight3;
color: $m-gray-d1;
}

%copy-metadata {
@extend %t-copy-sub2;
color: $m-gray-d1;


%copy-metadata-value {
@extend %t-weight2;
}

%copy-metadata-value {
@extend %t-weight4;
}
}

// application: canned links
%copy-link {
border-bottom: 1px dotted transparent;

&:hover, &:active {
border-color: $link-color-d1;
}
}

%copy-badge {
@extend %t-title8;
@extend %t-weight5;
border-radius: ($baseline/5);
padding: ($baseline/2) $baseline;
text-transform: uppercase;
}
Loading