diff --git a/lms/static/sass/course/courseware/_sidebar.scss b/lms/static/sass/course/courseware/_sidebar.scss index b0c948933482..ee89e3dd52e5 100644 --- a/lms/static/sass/course/courseware/_sidebar.scss +++ b/lms/static/sass/course/courseware/_sidebar.scss @@ -1,3 +1,5 @@ +@import 'bourbon/bourbon'; + .course-index { @include transition(all 0.2s $ease-in-out-quad 0s); @include border-right(1px solid $border-color-2); diff --git a/xmodule/css/capa/display.scss b/xmodule/css/capa/display.scss index 684b43da734e..b8536a40d159 100644 --- a/xmodule/css/capa/display.scss +++ b/xmodule/css/capa/display.scss @@ -18,6 +18,7 @@ // * +Problem - Choice Text Group // * +Problem - Image Input Overrides // * +Problem - Annotation Problem Overrides +@import 'bourbon/bourbon'; // +Variables - Capa // ==================== diff --git a/xmodule/css/html/display.scss b/xmodule/css/html/display.scss index d16c2e74978f..d9e123e6d5e0 100644 --- a/xmodule/css/html/display.scss +++ b/xmodule/css/html/display.scss @@ -1,3 +1,5 @@ +@import 'bourbon/bourbon'; + // HTML component display: * { line-height: 1.4em; diff --git a/xmodule/css/tabs/tabs.scss b/xmodule/css/tabs/tabs.scss index 277462675f1f..e8b025442de4 100644 --- a/xmodule/css/tabs/tabs.scss +++ b/xmodule/css/tabs/tabs.scss @@ -130,10 +130,6 @@ padding: 0; border: none; } - - .blue-button { - @include blue-button; - } } diff --git a/xmodule/css/video/display.scss b/xmodule/css/video/display.scss index b4c6eb4c4253..80292f1f230c 100644 --- a/xmodule/css/video/display.scss +++ b/xmodule/css/video/display.scss @@ -8,6 +8,7 @@ // -------- // Defaults: what displays if the icon font doesn't load. // -------- +@import 'bourbon/bourbon'; // the html target is necessary for xblocks and xmodules, but works across the board diff --git a/xmodule/static_content.py b/xmodule/static_content.py index b75d2e8de69a..de705320de51 100755 --- a/xmodule/static_content.py +++ b/xmodule/static_content.py @@ -147,10 +147,8 @@ def _write_styles(selector, output_root, classes, css_attribute): for class_ in classes: css_imports[class_].add(fragment_name) - module_styles_lines = [ - "@import 'bourbon/bourbon';", - "@import 'lms/theme/variables';", - ] + module_styles_lines = [] + for class_, fragment_names in sorted(css_imports.items()): fragment_names = sorted(fragment_names) module_styles_lines.append("""{selector}.xmodule_{class_} {{""".format(