Merge pull request #12452 from edx/clrux/ac-414

AC-414 adding headings as first child to sections
This commit is contained in:
clrux
2016-06-10 15:23:10 -04:00
committed by GitHub
52 changed files with 343 additions and 233 deletions

View File

@@ -13,10 +13,10 @@ $(function() {
$.cookie('saved_index', active);
},
animate: 400,
header: "> div.wrap >h2",
header: "> .wrap > .hd",
icons: icons,
active: isNaN(parseInt($.cookie('saved_index'))) ? 0 : parseInt($.cookie('saved_index')),
collapsible: true
}
);
});
});

View File

@@ -4,6 +4,7 @@
// 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/headings';
@import 'base/extends';
@import 'base/animations';
@import 'shared/tooltips';
@@ -66,6 +67,3 @@
// responsive
@import 'base/layouts'; // temporary spot for responsive course
// xmodule
@import 'xmodule/headings';

View File

@@ -3,9 +3,9 @@
* The UXPL isn't available retroactively, so this shims
* the headings from the UXPL with what we're using in
* the platform to better sync things up in the meantime.
* It is scoped to #seq_content, specifically for xblock.
* These are available to entire LMS.
*
* Once the UXPl is fitted retroactively, this can be removed.
* Once the UXPL is fitted retroactively (if ever then), this can be removed.
*/
$headings-count: 8;
@@ -88,30 +88,34 @@ $headings-base-color: $gray-d2;
letter-spacing: 1px;
}
// let's make these classnames available to the entire LMS!
.hd-1,
.hd-2,
.hd-3,
.hd-4,
.hd-5,
.hd-6,
.hd-7,
.hd-8 {
@extend %reset-headings;
}
// ----------------------------
// #CANNED
// ----------------------------
// canned heading classes
@for $i from 1 through $headings-count {
.hd-#{$i} {
@extend %hd-#{$i};
}
}
// H3 was problematic in xblocks, we so we'll keep it as it was
.xblock .xblock {
.hd-1,
.hd-2,
.hd-3,
.hd-4,
.hd-5,
.hd-6,
.hd-7,
.hd-8 {
@extend %reset-headings;
}
// ----------------------------
// #CANNED
// ----------------------------
// canned heading classes
@for $i from 1 through $headings-count {
.hd-#{$i} {
@extend %hd-#{$i};
}
}
h3 {
@extend %hd-2;
font-weight: $headings-font-weight-normal;

View File

@@ -406,11 +406,6 @@
// view - bulk email
// --------------------
.instructor-dashboard-wrapper-2 section.idash-section#send_email {
h2 {
// override forced uppercase
text-transform: none;
}
// form fields
.list-fields {
list-style: none;