diff --git a/cms/envs/common.py b/cms/envs/common.py
index 53318ea75f..8d28ddcd8d 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -240,16 +240,29 @@ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
from rooted_paths import rooted_glob
PIPELINE_CSS = {
- 'base-style': {
+ 'style-vendor': {
'source_filenames': [
+ 'css/vendor/normalize.css',
+ 'css/vendor/font-awesome.css',
'js/vendor/CodeMirror/codemirror.css',
'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
'css/vendor/jquery.qtip.min.css',
- 'sass/base-style.css',
- 'xmodule/modules.css',
- 'xmodule/descriptor.css',
+ 'js/vendor/markitup/skins/simple/style.css',
+ 'js/vendor/markitup/sets/wiki/style.css',
],
- 'output_filename': 'css/cms-base-style.css',
+ 'output_filename': 'css/cms-style-vendor.css',
+ },
+ 'style-app': {
+ 'source_filenames': [
+ 'sass/style-app.css',
+ ],
+ 'output_filename': 'css/cms-style-app.css',
+ },
+ 'style-xmodule': {
+ 'source_filenames': [
+ 'sass/style-xmodule.css',
+ ],
+ 'output_filename': 'css/cms-style-xmodule.css',
},
}
diff --git a/cms/static/css/ie.css b/cms/static/css/ie.css
deleted file mode 100644
index f497a329cf..0000000000
--- a/cms/static/css/ie.css
+++ /dev/null
@@ -1,196 +0,0 @@
-/* line 12, ../sass/_reset.scss */
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
- margin: 0;
- padding: 0;
- border: 0;
- outline: 0;
- vertical-align: baseline;
- background: transparent; }
-
-/* line 21, ../sass/_reset.scss */
-html, body {
- font-size: 100%; }
-
-/* line 26, ../sass/_reset.scss */
-article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
- display: block; }
-
-/* line 31, ../sass/_reset.scss */
-audio, canvas, video {
- display: inline-block; }
-
-/* line 36, ../sass/_reset.scss */
-audio:not([controls]) {
- display: none; }
-
-/* line 41, ../sass/_reset.scss */
-[hidden] {
- display: none; }
-
-/* line 47, ../sass/_reset.scss */
-html {
- font-size: 100%;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%; }
-
-/* line 54, ../sass/_reset.scss */
-html, button, input, select, textarea {
- font-family: sans-serif; }
-
-/* line 60, ../sass/_reset.scss */
-a:focus {
- outline: thin dotted;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px; }
-/* line 69, ../sass/_reset.scss */
-a:hover, a:active {
- outline: 0; }
-
-/* line 75, ../sass/_reset.scss */
-abbr[title] {
- border-bottom: 1px dotted; }
-
-/* line 80, ../sass/_reset.scss */
-b, strong {
- font-weight: bold; }
-
-/* line 84, ../sass/_reset.scss */
-blockquote {
- margin: 1em 40px; }
-
-/* line 89, ../sass/_reset.scss */
-dfn {
- font-style: italic; }
-
-/* line 94, ../sass/_reset.scss */
-mark {
- background: #ff0;
- color: #000; }
-
-/* line 101, ../sass/_reset.scss */
-pre, code, kbd, samp {
- font-family: monospace, serif;
- _font-family: 'courier new', monospace;
- font-size: 1em; }
-
-/* line 108, ../sass/_reset.scss */
-pre {
- white-space: pre;
- white-space: pre-wrap;
- word-wrap: break-word; }
-
-/* line 115, ../sass/_reset.scss */
-blockquote, q {
- quotes: none; }
- /* line 117, ../sass/_reset.scss */
- blockquote:before, blockquote:after, q:before, q:after {
- content: '';
- content: none; }
-
-/* line 123, ../sass/_reset.scss */
-small {
- font-size: 75%; }
-
-/* line 127, ../sass/_reset.scss */
-sub, sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline; }
-
-/* line 134, ../sass/_reset.scss */
-sup {
- top: -0.5em; }
-
-/* line 138, ../sass/_reset.scss */
-sub {
- bottom: -0.25em; }
-
-/* line 143, ../sass/_reset.scss */
-nav ul, nav ol {
- list-style: none;
- list-style-image: none; }
-
-/* line 150, ../sass/_reset.scss */
-img {
- border: 0;
- height: auto;
- max-width: 100%;
- -ms-interpolation-mode: bicubic; }
-
-/* line 158, ../sass/_reset.scss */
-svg:not(:root) {
- overflow: hidden; }
-
-/* line 163, ../sass/_reset.scss */
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em; }
-
-/* line 169, ../sass/_reset.scss */
-legend {
- border: 0;
- padding: 0;
- white-space: normal; }
-
-/* line 175, ../sass/_reset.scss */
-button, input, select, textarea {
- font-size: 100%;
- margin: 0;
- vertical-align: baseline; }
-
-/* line 182, ../sass/_reset.scss */
-button, input {
- line-height: normal; }
-
-/* line 186, ../sass/_reset.scss */
-button, input[type="button"], input[type="reset"], input[type="submit"] {
- cursor: pointer;
- -webkit-appearance: button; }
-
-/* line 192, ../sass/_reset.scss */
-button[disabled], input[disabled] {
- cursor: default; }
-
-/* line 196, ../sass/_reset.scss */
-input[type="checkbox"], input[type="radio"] {
- box-sizing: border-box;
- padding: 0; }
-
-/* line 201, ../sass/_reset.scss */
-input[type="search"] {
- -webkit-appearance: textfield;
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box;
- box-sizing: content-box; }
-
-/* line 209, ../sass/_reset.scss */
-input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none; }
-
-/* line 215, ../sass/_reset.scss */
-button::-moz-focus-inner, input::-moz-focus-inner {
- border: 0;
- padding: 0; }
-
-/* line 220, ../sass/_reset.scss */
-textarea {
- overflow: auto;
- vertical-align: top; }
-
-/* line 226, ../sass/_reset.scss */
-table {
- border-collapse: collapse;
- border-spacing: 0; }
diff --git a/cms/static/fonts/vendor/FontAwesome.otf b/cms/static/fonts/vendor/FontAwesome.otf
deleted file mode 100644
index 32dd8b1cd5..0000000000
Binary files a/cms/static/fonts/vendor/FontAwesome.otf and /dev/null differ
diff --git a/cms/static/fonts/vendor/fontawesome-webfont.eot b/cms/static/fonts/vendor/fontawesome-webfont.eot
deleted file mode 100755
index c080283bdd..0000000000
Binary files a/cms/static/fonts/vendor/fontawesome-webfont.eot and /dev/null differ
diff --git a/cms/static/fonts/vendor/fontawesome-webfont.svg b/cms/static/fonts/vendor/fontawesome-webfont.svg
deleted file mode 100755
index 10a1e1bbf7..0000000000
--- a/cms/static/fonts/vendor/fontawesome-webfont.svg
+++ /dev/null
@@ -1,339 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/cms/static/fonts/vendor/fontawesome-webfont.ttf b/cms/static/fonts/vendor/fontawesome-webfont.ttf
deleted file mode 100755
index 908f69ec9a..0000000000
Binary files a/cms/static/fonts/vendor/fontawesome-webfont.ttf and /dev/null differ
diff --git a/cms/static/fonts/vendor/fontawesome-webfont.woff b/cms/static/fonts/vendor/fontawesome-webfont.woff
deleted file mode 100755
index a33af950ae..0000000000
Binary files a/cms/static/fonts/vendor/fontawesome-webfont.woff and /dev/null differ
diff --git a/cms/static/sass/contexts/_ie.scss b/cms/static/sass/contexts/_ie.scss
new file mode 100644
index 0000000000..2f20548dfc
--- /dev/null
+++ b/cms/static/sass/contexts/_ie.scss
@@ -0,0 +1,21 @@
+// studio - contexts - ie
+// ====================
+
+// CASE: less than or equal to IE9
+.lte9 {
+
+}
+
+// ====================
+
+// CASE: less than or equal to IE8
+.lte8 {
+
+}
+
+// ====================
+
+// CASE: less than or equal to IE7
+.lte7 {
+
+}
diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/style-app.scss
similarity index 85%
rename from cms/static/sass/base-style.scss
rename to cms/static/sass/style-app.scss
index fedef0676e..48d8b9ce77 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/style-app.scss
@@ -3,15 +3,10 @@
// libs and resets *do not edit*
@import 'bourbon/bourbon'; // lib - bourbon
-@import 'bourbon/addons/button'; // lib bourbon - button add-on
-
// VENDOR + REBASE *referenced/used vendor presentation and reset*
// ====================
-@import 'vendor/normalize';
@import 'reset';
-@import 'vendor/font-awesome';
-
// BASE *default edX offerings*
// ====================
@@ -61,13 +56,10 @@
@import 'views/checklists';
@import 'views/textbooks';
+// base - contexts
+@import 'contexts/ie'; // ie-specific rules (mostly for known/older bugs)
+
// temp - inherited
@import 'assets/content-types';
-// xmodule
-@import 'xmodule/modules/css/module-styles.scss';
-@import 'xmodule/descriptors/css/module-styles.scss';
-@import 'elements/xmodules'; // styling for Studio-specific contexts
-
-
@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/)
diff --git a/cms/static/sass/style-xmodule.scss b/cms/static/sass/style-xmodule.scss
new file mode 100644
index 0000000000..330dca99d8
--- /dev/null
+++ b/cms/static/sass/style-xmodule.scss
@@ -0,0 +1,35 @@
+// studio - xmodule architecture
+// ====================
+
+// libs and resets *do not edit*
+@import 'bourbon/bourbon'; // lib - bourbon
+
+// VENDOR + REBASE *referenced/used vendor presentation and reset*
+// ====================
+@import 'reset';
+
+// BASE *default edX offerings*
+// ====================
+// base - utilities
+@import 'variables';
+@import 'mixins';
+@import 'mixins-inherited';
+
+// base - assets
+@import 'assets/fonts';
+@import 'assets/graphics'; // sprites, basic img/figure/svg styling
+@import 'assets/anims'; // animations
+
+// base - starter
+@import 'base';
+
+// base - elements
+@import 'elements/typography';
+@import 'elements/icons'; // references to icons used
+@import 'elements/controls'; // buttons, link styles, sliders, etc.
+@import 'elements/navigation'; // all archetypes of navigation
+
+// xmodule
+@import 'xmodule/modules/css/module-styles.scss';
+@import 'xmodule/descriptors/css/module-styles.scss';
+@import 'elements/xmodules'; // styling for Studio-specific contexts
diff --git a/cms/static/sass/vendor/_font-awesome.scss b/cms/static/sass/vendor/_font-awesome.scss
deleted file mode 100644
index 035ca8c750..0000000000
--- a/cms/static/sass/vendor/_font-awesome.scss
+++ /dev/null
@@ -1,1268 +0,0 @@
-/*!
- * Font Awesome 3.1.0
- * the iconic font designed for Bootstrap
- * -------------------------------------------------------
- * The full suite of pictographic icons, examples, and documentation
- * can be found at: http://fontawesome.io
- *
- * License
- * -------------------------------------------------------
- * - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
- * http://scripts.sil.org/OFL
- * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
- * http://opensource.org/licenses/mit-license.html
- * - Font Awesome documentation licensed under CC BY 3.0 License -
- * http://creativecommons.org/licenses/by/3.0/
- * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fontawesome.io"
-
- * Contact
- * -------------------------------------------------------
- * Email: dave@fontawesome.io
- * Twitter: http://twitter.com/fortaweso_me
- * Work: Lead Product Designer @ http://kyruus.com
- */
-/* FONT PATH
- * -------------------------- */
-@font-face {
- font-family: 'FontAwesome';
- src: url('../fonts/vendor/fontawesome-webfont.eot?v=3.1.0');
- src: url('../fonts/vendor/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'), url('../fonts/vendor/fontawesome-webfont.woff?v=3.1.0') format('woff'), url('../fonts/vendor/fontawesome-webfont.ttf?v=3.1.0') format('truetype'), url('../fonts/vendor/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-/* FONT AWESOME CORE
- * -------------------------- */
-[class^="icon-"],
-[class*=" icon-"] {
- font-family: FontAwesome;
- font-weight: normal;
- font-style: normal;
- text-decoration: inherit;
- -webkit-font-smoothing: antialiased;
- *margin-right: .3em;
-}
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
- text-decoration: inherit;
- display: inline-block;
- speak: none;
-}
-/* makes the font 33% larger relative to the icon container */
-.icon-large:before {
- vertical-align: -10%;
- font-size: 1.3333333333333333em;
-}
-/* makes sure icons active on rollover in links */
-a [class^="icon-"],
-a [class*=" icon-"],
-a [class^="icon-"]:before,
-a [class*=" icon-"]:before {
- display: inline;
-}
-/* increased font size for icon-large */
-[class^="icon-"].icon-fixed-width,
-[class*=" icon-"].icon-fixed-width {
- display: inline-block;
- width: 1.2857142857142858em;
- text-align: center;
-}
-[class^="icon-"].icon-fixed-width.icon-large,
-[class*=" icon-"].icon-fixed-width.icon-large {
- width: 1.5714285714285714em;
-}
-ul.icons-ul {
- list-style-type: none;
- text-indent: -0.7142857142857143em;
- margin-left: 2.142857142857143em;
-}
-ul.icons-ul > li .icon-li {
- width: 0.7142857142857143em;
- display: inline-block;
- text-align: center;
-}
-[class^="icon-"].hide,
-[class*=" icon-"].hide {
- display: none;
-}
-.icon-muted {
- color: #eeeeee;
-}
-.icon-light {
- color: #ffffff;
-}
-.icon-dark {
- color: #333333;
-}
-.icon-border {
- border: solid 1px #eeeeee;
- padding: .2em .25em .15em;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-.icon-2x {
- font-size: 2em;
-}
-.icon-2x.icon-border {
- border-width: 2px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-.icon-3x {
- font-size: 3em;
-}
-.icon-3x.icon-border {
- border-width: 3px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
-.icon-4x {
- font-size: 4em;
-}
-.icon-4x.icon-border {
- border-width: 4px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.icon-5x {
- font-size: 5em;
-}
-.icon-5x.icon-border {
- border-width: 5px;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
-}
-.pull-right {
- float: right;
-}
-.pull-left {
- float: left;
-}
-[class^="icon-"].pull-left,
-[class*=" icon-"].pull-left {
- margin-right: .3em;
-}
-[class^="icon-"].pull-right,
-[class*=" icon-"].pull-right {
- margin-left: .3em;
-}
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-/* Bootstrap 2.0 sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
- display: inline;
- width: auto;
- height: auto;
- line-height: normal;
- vertical-align: baseline;
- background-image: none;
- background-position: 0% 0%;
- background-repeat: repeat;
- margin-top: 0;
-}
-/* more sprites.less reset */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
- background-image: none;
-}
-/* keeps Bootstrap styles with and without icons the same */
-.btn [class^="icon-"].icon-large,
-.nav [class^="icon-"].icon-large,
-.btn [class*=" icon-"].icon-large,
-.nav [class*=" icon-"].icon-large {
- line-height: .9em;
-}
-.btn [class^="icon-"].icon-spin,
-.nav [class^="icon-"].icon-spin,
-.btn [class*=" icon-"].icon-spin,
-.nav [class*=" icon-"].icon-spin {
- display: inline-block;
-}
-.nav-tabs [class^="icon-"],
-.nav-pills [class^="icon-"],
-.nav-tabs [class*=" icon-"],
-.nav-pills [class*=" icon-"],
-.nav-tabs [class^="icon-"].icon-large,
-.nav-pills [class^="icon-"].icon-large,
-.nav-tabs [class*=" icon-"].icon-large,
-.nav-pills [class*=" icon-"].icon-large {
- line-height: .9em;
-}
-.btn [class^="icon-"].pull-left.icon-2x,
-.btn [class*=" icon-"].pull-left.icon-2x,
-.btn [class^="icon-"].pull-right.icon-2x,
-.btn [class*=" icon-"].pull-right.icon-2x {
- margin-top: .18em;
-}
-.btn [class^="icon-"].icon-spin.icon-large,
-.btn [class*=" icon-"].icon-spin.icon-large {
- line-height: .8em;
-}
-.btn.btn-small [class^="icon-"].pull-left.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-small [class^="icon-"].pull-right.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
- margin-top: .25em;
-}
-.btn.btn-large [class^="icon-"],
-.btn.btn-large [class*=" icon-"] {
- margin-top: 0;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
- margin-top: .05em;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x {
- margin-right: .2em;
-}
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
- margin-left: .2em;
-}
-/* EXTRAS
- * -------------------------- */
-/* Stacked and layered icon */
-.icon-stack {
- position: relative;
- display: inline-block;
- width: 2em;
- height: 2em;
- line-height: 2em;
- vertical-align: -35%;
-}
-.icon-stack [class^="icon-"],
-.icon-stack [class*=" icon-"] {
- display: block;
- text-align: center;
- position: absolute;
- width: 100%;
- height: 100%;
- font-size: 1em;
- line-height: inherit;
- *line-height: 2em;
-}
-.icon-stack .icon-stack-base {
- font-size: 2em;
- *line-height: 1em;
-}
-/* Animated rotating icon */
-.icon-spin {
- display: inline-block;
- -moz-animation: spin 2s infinite linear;
- -o-animation: spin 2s infinite linear;
- -webkit-animation: spin 2s infinite linear;
- animation: spin 2s infinite linear;
-}
-@-moz-keyframes spin {
- 0% {
- -moz-transform: rotate(0deg);
- }
- 100% {
- -moz-transform: rotate(359deg);
- }
-}
-@-webkit-keyframes spin {
- 0% {
- -webkit-transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- }
-}
-@-o-keyframes spin {
- 0% {
- -o-transform: rotate(0deg);
- }
- 100% {
- -o-transform: rotate(359deg);
- }
-}
-@-ms-keyframes spin {
- 0% {
- -ms-transform: rotate(0deg);
- }
- 100% {
- -ms-transform: rotate(359deg);
- }
-}
-@keyframes spin {
- 0% {
- transform: rotate(0deg);
- }
- 100% {
- transform: rotate(359deg);
- }
-}
-/* Icon rotations and mirroring */
-.icon-rotate-90:before {
- -webkit-transform: rotate(90deg);
- -moz-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- -o-transform: rotate(90deg);
- transform: rotate(90deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-}
-.icon-rotate-180:before {
- -webkit-transform: rotate(180deg);
- -moz-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- -o-transform: rotate(180deg);
- transform: rotate(180deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-}
-.icon-rotate-270:before {
- -webkit-transform: rotate(270deg);
- -moz-transform: rotate(270deg);
- -ms-transform: rotate(270deg);
- -o-transform: rotate(270deg);
- transform: rotate(270deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-}
-.icon-flip-horizontal:before {
- -webkit-transform: scale(-1, 1);
- -moz-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- -o-transform: scale(-1, 1);
- transform: scale(-1, 1);
-}
-.icon-flip-vertical:before {
- -webkit-transform: scale(1, -1);
- -moz-transform: scale(1, -1);
- -ms-transform: scale(1, -1);
- -o-transform: scale(1, -1);
- transform: scale(1, -1);
-}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
- readers do not read off random characters that represent icons */
-.icon-glass:before {
- content: "\f000";
-}
-.icon-music:before {
- content: "\f001";
-}
-.icon-search:before {
- content: "\f002";
-}
-.icon-envelope:before {
- content: "\f003";
-}
-.icon-heart:before {
- content: "\f004";
-}
-.icon-star:before {
- content: "\f005";
-}
-.icon-star-empty:before {
- content: "\f006";
-}
-.icon-user:before {
- content: "\f007";
-}
-.icon-film:before {
- content: "\f008";
-}
-.icon-th-large:before {
- content: "\f009";
-}
-.icon-th:before {
- content: "\f00a";
-}
-.icon-th-list:before {
- content: "\f00b";
-}
-.icon-ok:before {
- content: "\f00c";
-}
-.icon-remove:before {
- content: "\f00d";
-}
-.icon-zoom-in:before {
- content: "\f00e";
-}
-.icon-zoom-out:before {
- content: "\f010";
-}
-.icon-off:before {
- content: "\f011";
-}
-.icon-signal:before {
- content: "\f012";
-}
-.icon-cog:before {
- content: "\f013";
-}
-.icon-trash:before {
- content: "\f014";
-}
-.icon-home:before {
- content: "\f015";
-}
-.icon-file:before {
- content: "\f016";
-}
-.icon-time:before {
- content: "\f017";
-}
-.icon-road:before {
- content: "\f018";
-}
-.icon-download-alt:before {
- content: "\f019";
-}
-.icon-download:before {
- content: "\f01a";
-}
-.icon-upload:before {
- content: "\f01b";
-}
-.icon-inbox:before {
- content: "\f01c";
-}
-.icon-play-circle:before {
- content: "\f01d";
-}
-.icon-repeat:before,
-.icon-rotate-right:before {
- content: "\f01e";
-}
-/* F020 doesn't work in Safari. all shifted one down */
-.icon-refresh:before {
- content: "\f021";
-}
-.icon-list-alt:before {
- content: "\f022";
-}
-.icon-lock:before {
- content: "\f023";
-}
-.icon-flag:before {
- content: "\f024";
-}
-.icon-headphones:before {
- content: "\f025";
-}
-.icon-volume-off:before {
- content: "\f026";
-}
-.icon-volume-down:before {
- content: "\f027";
-}
-.icon-volume-up:before {
- content: "\f028";
-}
-.icon-qrcode:before {
- content: "\f029";
-}
-.icon-barcode:before {
- content: "\f02a";
-}
-.icon-tag:before {
- content: "\f02b";
-}
-.icon-tags:before {
- content: "\f02c";
-}
-.icon-book:before {
- content: "\f02d";
-}
-.icon-bookmark:before {
- content: "\f02e";
-}
-.icon-print:before {
- content: "\f02f";
-}
-.icon-camera:before {
- content: "\f030";
-}
-.icon-font:before {
- content: "\f031";
-}
-.icon-bold:before {
- content: "\f032";
-}
-.icon-italic:before {
- content: "\f033";
-}
-.icon-text-height:before {
- content: "\f034";
-}
-.icon-text-width:before {
- content: "\f035";
-}
-.icon-align-left:before {
- content: "\f036";
-}
-.icon-align-center:before {
- content: "\f037";
-}
-.icon-align-right:before {
- content: "\f038";
-}
-.icon-align-justify:before {
- content: "\f039";
-}
-.icon-list:before {
- content: "\f03a";
-}
-.icon-indent-left:before {
- content: "\f03b";
-}
-.icon-indent-right:before {
- content: "\f03c";
-}
-.icon-facetime-video:before {
- content: "\f03d";
-}
-.icon-picture:before {
- content: "\f03e";
-}
-.icon-pencil:before {
- content: "\f040";
-}
-.icon-map-marker:before {
- content: "\f041";
-}
-.icon-adjust:before {
- content: "\f042";
-}
-.icon-tint:before {
- content: "\f043";
-}
-.icon-edit:before {
- content: "\f044";
-}
-.icon-share:before {
- content: "\f045";
-}
-.icon-check:before {
- content: "\f046";
-}
-.icon-move:before {
- content: "\f047";
-}
-.icon-step-backward:before {
- content: "\f048";
-}
-.icon-fast-backward:before {
- content: "\f049";
-}
-.icon-backward:before {
- content: "\f04a";
-}
-.icon-play:before {
- content: "\f04b";
-}
-.icon-pause:before {
- content: "\f04c";
-}
-.icon-stop:before {
- content: "\f04d";
-}
-.icon-forward:before {
- content: "\f04e";
-}
-.icon-fast-forward:before {
- content: "\f050";
-}
-.icon-step-forward:before {
- content: "\f051";
-}
-.icon-eject:before {
- content: "\f052";
-}
-.icon-chevron-left:before {
- content: "\f053";
-}
-.icon-chevron-right:before {
- content: "\f054";
-}
-.icon-plus-sign:before {
- content: "\f055";
-}
-.icon-minus-sign:before {
- content: "\f056";
-}
-.icon-remove-sign:before {
- content: "\f057";
-}
-.icon-ok-sign:before {
- content: "\f058";
-}
-.icon-question-sign:before {
- content: "\f059";
-}
-.icon-info-sign:before {
- content: "\f05a";
-}
-.icon-screenshot:before {
- content: "\f05b";
-}
-.icon-remove-circle:before {
- content: "\f05c";
-}
-.icon-ok-circle:before {
- content: "\f05d";
-}
-.icon-ban-circle:before {
- content: "\f05e";
-}
-.icon-arrow-left:before {
- content: "\f060";
-}
-.icon-arrow-right:before {
- content: "\f061";
-}
-.icon-arrow-up:before {
- content: "\f062";
-}
-.icon-arrow-down:before {
- content: "\f063";
-}
-.icon-share-alt:before,
-.icon-mail-forward:before {
- content: "\f064";
-}
-.icon-resize-full:before {
- content: "\f065";
-}
-.icon-resize-small:before {
- content: "\f066";
-}
-.icon-plus:before {
- content: "\f067";
-}
-.icon-minus:before {
- content: "\f068";
-}
-.icon-asterisk:before {
- content: "\f069";
-}
-.icon-exclamation-sign:before {
- content: "\f06a";
-}
-.icon-gift:before {
- content: "\f06b";
-}
-.icon-leaf:before {
- content: "\f06c";
-}
-.icon-fire:before {
- content: "\f06d";
-}
-.icon-eye-open:before {
- content: "\f06e";
-}
-.icon-eye-close:before {
- content: "\f070";
-}
-.icon-warning-sign:before {
- content: "\f071";
-}
-.icon-plane:before {
- content: "\f072";
-}
-.icon-calendar:before {
- content: "\f073";
-}
-.icon-random:before {
- content: "\f074";
-}
-.icon-comment:before {
- content: "\f075";
-}
-.icon-magnet:before {
- content: "\f076";
-}
-.icon-chevron-up:before {
- content: "\f077";
-}
-.icon-chevron-down:before {
- content: "\f078";
-}
-.icon-retweet:before {
- content: "\f079";
-}
-.icon-shopping-cart:before {
- content: "\f07a";
-}
-.icon-folder-close:before {
- content: "\f07b";
-}
-.icon-folder-open:before {
- content: "\f07c";
-}
-.icon-resize-vertical:before {
- content: "\f07d";
-}
-.icon-resize-horizontal:before {
- content: "\f07e";
-}
-.icon-bar-chart:before {
- content: "\f080";
-}
-.icon-twitter-sign:before {
- content: "\f081";
-}
-.icon-facebook-sign:before {
- content: "\f082";
-}
-.icon-camera-retro:before {
- content: "\f083";
-}
-.icon-key:before {
- content: "\f084";
-}
-.icon-cogs:before {
- content: "\f085";
-}
-.icon-comments:before {
- content: "\f086";
-}
-.icon-thumbs-up:before {
- content: "\f087";
-}
-.icon-thumbs-down:before {
- content: "\f088";
-}
-.icon-star-half:before {
- content: "\f089";
-}
-.icon-heart-empty:before {
- content: "\f08a";
-}
-.icon-signout:before {
- content: "\f08b";
-}
-.icon-linkedin-sign:before {
- content: "\f08c";
-}
-.icon-pushpin:before {
- content: "\f08d";
-}
-.icon-external-link:before {
- content: "\f08e";
-}
-.icon-signin:before {
- content: "\f090";
-}
-.icon-trophy:before {
- content: "\f091";
-}
-.icon-github-sign:before {
- content: "\f092";
-}
-.icon-upload-alt:before {
- content: "\f093";
-}
-.icon-lemon:before {
- content: "\f094";
-}
-.icon-phone:before {
- content: "\f095";
-}
-.icon-check-empty:before {
- content: "\f096";
-}
-.icon-bookmark-empty:before {
- content: "\f097";
-}
-.icon-phone-sign:before {
- content: "\f098";
-}
-.icon-twitter:before {
- content: "\f099";
-}
-.icon-facebook:before {
- content: "\f09a";
-}
-.icon-github:before {
- content: "\f09b";
-}
-.icon-unlock:before {
- content: "\f09c";
-}
-.icon-credit-card:before {
- content: "\f09d";
-}
-.icon-rss:before {
- content: "\f09e";
-}
-.icon-hdd:before {
- content: "\f0a0";
-}
-.icon-bullhorn:before {
- content: "\f0a1";
-}
-.icon-bell:before {
- content: "\f0a2";
-}
-.icon-certificate:before {
- content: "\f0a3";
-}
-.icon-hand-right:before {
- content: "\f0a4";
-}
-.icon-hand-left:before {
- content: "\f0a5";
-}
-.icon-hand-up:before {
- content: "\f0a6";
-}
-.icon-hand-down:before {
- content: "\f0a7";
-}
-.icon-circle-arrow-left:before {
- content: "\f0a8";
-}
-.icon-circle-arrow-right:before {
- content: "\f0a9";
-}
-.icon-circle-arrow-up:before {
- content: "\f0aa";
-}
-.icon-circle-arrow-down:before {
- content: "\f0ab";
-}
-.icon-globe:before {
- content: "\f0ac";
-}
-.icon-wrench:before {
- content: "\f0ad";
-}
-.icon-tasks:before {
- content: "\f0ae";
-}
-.icon-filter:before {
- content: "\f0b0";
-}
-.icon-briefcase:before {
- content: "\f0b1";
-}
-.icon-fullscreen:before {
- content: "\f0b2";
-}
-.icon-group:before {
- content: "\f0c0";
-}
-.icon-link:before {
- content: "\f0c1";
-}
-.icon-cloud:before {
- content: "\f0c2";
-}
-.icon-beaker:before {
- content: "\f0c3";
-}
-.icon-cut:before {
- content: "\f0c4";
-}
-.icon-copy:before {
- content: "\f0c5";
-}
-.icon-paper-clip:before {
- content: "\f0c6";
-}
-.icon-save:before {
- content: "\f0c7";
-}
-.icon-sign-blank:before {
- content: "\f0c8";
-}
-.icon-reorder:before {
- content: "\f0c9";
-}
-.icon-list-ul:before {
- content: "\f0ca";
-}
-.icon-list-ol:before {
- content: "\f0cb";
-}
-.icon-strikethrough:before {
- content: "\f0cc";
-}
-.icon-underline:before {
- content: "\f0cd";
-}
-.icon-table:before {
- content: "\f0ce";
-}
-.icon-magic:before {
- content: "\f0d0";
-}
-.icon-truck:before {
- content: "\f0d1";
-}
-.icon-pinterest:before {
- content: "\f0d2";
-}
-.icon-pinterest-sign:before {
- content: "\f0d3";
-}
-.icon-google-plus-sign:before {
- content: "\f0d4";
-}
-.icon-google-plus:before {
- content: "\f0d5";
-}
-.icon-money:before {
- content: "\f0d6";
-}
-.icon-caret-down:before {
- content: "\f0d7";
-}
-.icon-caret-up:before {
- content: "\f0d8";
-}
-.icon-caret-left:before {
- content: "\f0d9";
-}
-.icon-caret-right:before {
- content: "\f0da";
-}
-.icon-columns:before {
- content: "\f0db";
-}
-.icon-sort:before {
- content: "\f0dc";
-}
-.icon-sort-down:before {
- content: "\f0dd";
-}
-.icon-sort-up:before {
- content: "\f0de";
-}
-.icon-envelope-alt:before {
- content: "\f0e0";
-}
-.icon-linkedin:before {
- content: "\f0e1";
-}
-.icon-undo:before,
-.icon-rotate-left:before {
- content: "\f0e2";
-}
-.icon-legal:before {
- content: "\f0e3";
-}
-.icon-dashboard:before {
- content: "\f0e4";
-}
-.icon-comment-alt:before {
- content: "\f0e5";
-}
-.icon-comments-alt:before {
- content: "\f0e6";
-}
-.icon-bolt:before {
- content: "\f0e7";
-}
-.icon-sitemap:before {
- content: "\f0e8";
-}
-.icon-umbrella:before {
- content: "\f0e9";
-}
-.icon-paste:before {
- content: "\f0ea";
-}
-.icon-lightbulb:before {
- content: "\f0eb";
-}
-.icon-exchange:before {
- content: "\f0ec";
-}
-.icon-cloud-download:before {
- content: "\f0ed";
-}
-.icon-cloud-upload:before {
- content: "\f0ee";
-}
-.icon-user-md:before {
- content: "\f0f0";
-}
-.icon-stethoscope:before {
- content: "\f0f1";
-}
-.icon-suitcase:before {
- content: "\f0f2";
-}
-.icon-bell-alt:before {
- content: "\f0f3";
-}
-.icon-coffee:before {
- content: "\f0f4";
-}
-.icon-food:before {
- content: "\f0f5";
-}
-.icon-file-alt:before {
- content: "\f0f6";
-}
-.icon-building:before {
- content: "\f0f7";
-}
-.icon-hospital:before {
- content: "\f0f8";
-}
-.icon-ambulance:before {
- content: "\f0f9";
-}
-.icon-medkit:before {
- content: "\f0fa";
-}
-.icon-fighter-jet:before {
- content: "\f0fb";
-}
-.icon-beer:before {
- content: "\f0fc";
-}
-.icon-h-sign:before {
- content: "\f0fd";
-}
-.icon-plus-sign-alt:before {
- content: "\f0fe";
-}
-.icon-double-angle-left:before {
- content: "\f100";
-}
-.icon-double-angle-right:before {
- content: "\f101";
-}
-.icon-double-angle-up:before {
- content: "\f102";
-}
-.icon-double-angle-down:before {
- content: "\f103";
-}
-.icon-angle-left:before {
- content: "\f104";
-}
-.icon-angle-right:before {
- content: "\f105";
-}
-.icon-angle-up:before {
- content: "\f106";
-}
-.icon-angle-down:before {
- content: "\f107";
-}
-.icon-desktop:before {
- content: "\f108";
-}
-.icon-laptop:before {
- content: "\f109";
-}
-.icon-tablet:before {
- content: "\f10a";
-}
-.icon-mobile-phone:before {
- content: "\f10b";
-}
-.icon-circle-blank:before {
- content: "\f10c";
-}
-.icon-quote-left:before {
- content: "\f10d";
-}
-.icon-quote-right:before {
- content: "\f10e";
-}
-.icon-spinner:before {
- content: "\f110";
-}
-.icon-circle:before {
- content: "\f111";
-}
-.icon-reply:before,
-.icon-mail-reply:before {
- content: "\f112";
-}
-.icon-folder-close-alt:before {
- content: "\f114";
-}
-.icon-folder-open-alt:before {
- content: "\f115";
-}
-.icon-expand-alt:before {
- content: "\f116";
-}
-.icon-collapse-alt:before {
- content: "\f117";
-}
-.icon-smile:before {
- content: "\f118";
-}
-.icon-frown:before {
- content: "\f119";
-}
-.icon-meh:before {
- content: "\f11a";
-}
-.icon-gamepad:before {
- content: "\f11b";
-}
-.icon-keyboard:before {
- content: "\f11c";
-}
-.icon-flag-alt:before {
- content: "\f11d";
-}
-.icon-flag-checkered:before {
- content: "\f11e";
-}
-.icon-terminal:before {
- content: "\f120";
-}
-.icon-code:before {
- content: "\f121";
-}
-.icon-reply-all:before {
- content: "\f122";
-}
-.icon-mail-reply-all:before {
- content: "\f122";
-}
-.icon-star-half-full:before,
-.icon-star-half-empty:before {
- content: "\f123";
-}
-.icon-location-arrow:before {
- content: "\f124";
-}
-.icon-crop:before {
- content: "\f125";
-}
-.icon-code-fork:before {
- content: "\f126";
-}
-.icon-unlink:before {
- content: "\f127";
-}
-.icon-question:before {
- content: "\f128";
-}
-.icon-info:before {
- content: "\f129";
-}
-.icon-exclamation:before {
- content: "\f12a";
-}
-.icon-superscript:before {
- content: "\f12b";
-}
-.icon-subscript:before {
- content: "\f12c";
-}
-.icon-eraser:before {
- content: "\f12d";
-}
-.icon-puzzle-piece:before {
- content: "\f12e";
-}
-.icon-microphone:before {
- content: "\f130";
-}
-.icon-microphone-off:before {
- content: "\f131";
-}
-.icon-shield:before {
- content: "\f132";
-}
-.icon-calendar-empty:before {
- content: "\f133";
-}
-.icon-fire-extinguisher:before {
- content: "\f134";
-}
-.icon-rocket:before {
- content: "\f135";
-}
-.icon-maxcdn:before {
- content: "\f136";
-}
-.icon-chevron-sign-left:before {
- content: "\f137";
-}
-.icon-chevron-sign-right:before {
- content: "\f138";
-}
-.icon-chevron-sign-up:before {
- content: "\f139";
-}
-.icon-chevron-sign-down:before {
- content: "\f13a";
-}
-.icon-html5:before {
- content: "\f13b";
-}
-.icon-css3:before {
- content: "\f13c";
-}
-.icon-anchor:before {
- content: "\f13d";
-}
-.icon-unlock-alt:before {
- content: "\f13e";
-}
-.icon-bullseye:before {
- content: "\f140";
-}
-.icon-ellipsis-horizontal:before {
- content: "\f141";
-}
-.icon-ellipsis-vertical:before {
- content: "\f142";
-}
-.icon-rss-sign:before {
- content: "\f143";
-}
-.icon-play-sign:before {
- content: "\f144";
-}
-.icon-ticket:before {
- content: "\f145";
-}
-.icon-minus-sign-alt:before {
- content: "\f146";
-}
-.icon-check-minus:before {
- content: "\f147";
-}
-.icon-level-up:before {
- content: "\f148";
-}
-.icon-level-down:before {
- content: "\f149";
-}
-.icon-check-sign:before {
- content: "\f14a";
-}
-.icon-edit-sign:before {
- content: "\f14b";
-}
-.icon-external-link-sign:before {
- content: "\f14c";
-}
-.icon-share-sign:before {
- content: "\f14d";
-}
diff --git a/cms/static/sass/vendor/_normalize.scss b/cms/static/sass/vendor/_normalize.scss
deleted file mode 100644
index 4474dee25a..0000000000
--- a/cms/static/sass/vendor/_normalize.scss
+++ /dev/null
@@ -1,504 +0,0 @@
-/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
-
-/* =============================================================================
- HTML5 display definitions
- ========================================================================== */
-
-/*
- * Corrects block display not defined in IE6/7/8/9 & FF3
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section,
-summary {
- display: block;
-}
-
-/*
- * Corrects inline-block display not defined in IE6/7/8/9 & FF3
- */
-
-audio,
-canvas,
-video {
- display: inline-block;
- *display: inline;
- *zoom: 1;
-}
-
-/*
- * Prevents modern browsers from displaying 'audio' without controls
- * Remove excess height in iOS5 devices
- */
-
-audio:not([controls]) {
- display: none;
- height: 0;
-}
-
-/*
- * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4
- * Known issue: no IE6 support
- */
-
-[hidden] {
- display: none;
-}
-
-
-/* =============================================================================
- Base
- ========================================================================== */
-
-/*
- * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
- * http://clagnut.com/blog/348/#c790
- * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
- * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
- */
-
-html {
- font-size: 100%; /* 1 */
- -webkit-text-size-adjust: 100%; /* 2 */
- -ms-text-size-adjust: 100%; /* 2 */
-}
-
-/*
- * Addresses font-family inconsistency between 'textarea' and other form elements.
- */
-
-html,
-button,
-input,
-select,
-textarea {
- font-family: sans-serif;
-}
-
-/*
- * Addresses margins handled incorrectly in IE6/7
- */
-
-body {
- margin: 0;
-}
-
-
-/* =============================================================================
- Links
- ========================================================================== */
-
-/*
- * Addresses outline displayed oddly in Chrome
- */
-
-a:focus {
- outline: thin dotted;
-}
-
-/*
- * Improves readability when focused and also mouse hovered in all browsers
- * people.opera.com/patrickl/experiments/keyboard/test
- */
-
-a:hover,
-a:active {
- outline: 0;
-}
-
-
-/* =============================================================================
- Typography
- ========================================================================== */
-
-/*
- * Addresses font sizes and margins set differently in IE6/7
- * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
- */
-
-h1 {
- font-size: 2em;
- margin: 0.67em 0;
-}
-
-h2 {
- font-size: 1.5em;
- margin: 0.83em 0;
-}
-
-h3 {
- font-size: 1.17em;
- margin: 1em 0;
-}
-
-h4 {
- font-size: 1em;
- margin: 1.33em 0;
-}
-
-h5 {
- font-size: 0.83em;
- margin: 1.67em 0;
-}
-
-h6 {
- font-size: 0.75em;
- margin: 2.33em 0;
-}
-
-/*
- * Addresses styling not present in IE7/8/9, S5, Chrome
- */
-
-abbr[title] {
- border-bottom: 1px dotted;
-}
-
-/*
- * Addresses style set to 'bolder' in FF3+, S4/5, Chrome
-*/
-
-b,
-strong {
- font-weight: bold;
-}
-
-blockquote {
- margin: 1em 40px;
-}
-
-/*
- * Addresses styling not present in S5, Chrome
- */
-
-dfn {
- font-style: italic;
-}
-
-/*
- * Addresses styling not present in IE6/7/8/9
- */
-
-mark {
- background: #ff0;
- color: #000;
-}
-
-/*
- * Addresses margins set differently in IE6/7
- */
-
-p,
-pre {
- margin: 1em 0;
-}
-
-/*
- * Corrects font family set oddly in IE6, S4/5, Chrome
- * en.wikipedia.org/wiki/User:Davidgothberg/Test59
- */
-
-pre,
-code,
-kbd,
-samp {
- font-family: monospace, serif;
- _font-family: 'courier new', monospace;
- font-size: 1em;
-}
-
-/*
- * Improves readability of pre-formatted text in all browsers
- */
-
-pre {
- white-space: pre;
- white-space: pre-wrap;
- word-wrap: break-word;
-}
-
-/*
- * 1. Addresses CSS quotes not supported in IE6/7
- * 2. Addresses quote property not supported in S4
- */
-
-/* 1 */
-
-q {
- quotes: none;
-}
-
-/* 2 */
-
-q:before,
-q:after {
- content: '';
- content: none;
-}
-
-small {
- font-size: 75%;
-}
-
-/*
- * Prevents sub and sup affecting line-height in all browsers
- * gist.github.com/413930
- */
-
-sub,
-sup {
- font-size: 75%;
- line-height: 0;
- position: relative;
- vertical-align: baseline;
-}
-
-sup {
- top: -0.5em;
-}
-
-sub {
- bottom: -0.25em;
-}
-
-
-/* =============================================================================
- Lists
- ========================================================================== */
-
-/*
- * Addresses margins set differently in IE6/7
- */
-
-dl,
-menu,
-ol,
-ul {
- margin: 1em 0;
-}
-
-dd {
- margin: 0 0 0 40px;
-}
-
-/*
- * Addresses paddings set differently in IE6/7
- */
-
-menu,
-ol,
-ul {
- padding: 0 0 0 40px;
-}
-
-/*
- * Corrects list images handled incorrectly in IE7
- */
-
-nav ul,
-nav ol {
- list-style: none;
- list-style-image: none;
-}
-
-
-/* =============================================================================
- Embedded content
- ========================================================================== */
-
-/*
- * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
- * 2. Improves image quality when scaled in IE7
- * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
- */
-
-img {
- border: 0; /* 1 */
- -ms-interpolation-mode: bicubic; /* 2 */
-}
-
-/*
- * Corrects overflow displayed oddly in IE9
- */
-
-svg:not(:root) {
- overflow: hidden;
-}
-
-
-/* =============================================================================
- Figures
- ========================================================================== */
-
-/*
- * Addresses margin not present in IE6/7/8/9, S5, O11
- */
-
-figure {
- margin: 0;
-}
-
-
-/* =============================================================================
- Forms
- ========================================================================== */
-
-/*
- * Corrects margin displayed oddly in IE6/7
- */
-
-form {
- margin: 0;
-}
-
-/*
- * Define consistent border, margin, and padding
- */
-
-fieldset {
- border: 1px solid #c0c0c0;
- margin: 0 2px;
- padding: 0.35em 0.625em 0.75em;
-}
-
-/*
- * 1. Corrects color not being inherited in IE6/7/8/9
- * 2. Corrects text not wrapping in FF3
- * 3. Corrects alignment displayed oddly in IE6/7
- */
-
-legend {
- border: 0; /* 1 */
- padding: 0;
- white-space: normal; /* 2 */
- *margin-left: -7px; /* 3 */
-}
-
-/*
- * 1. Corrects font size not being inherited in all browsers
- * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
- * 3. Improves appearance and consistency in all browsers
- */
-
-button,
-input,
-select,
-textarea {
- font-size: 100%; /* 1 */
- margin: 0; /* 2 */
- vertical-align: baseline; /* 3 */
- *vertical-align: middle; /* 3 */
-}
-
-/*
- * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
- */
-
-button,
-input {
- line-height: normal; /* 1 */
-}
-
-/*
- * 1. Improves usability and consistency of cursor style between image-type 'input' and others
- * 2. Corrects inability to style clickable 'input' types in iOS
- * 3. Removes inner spacing in IE7 without affecting normal text inputs
- * Known issue: inner spacing remains in IE6
- */
-
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- cursor: pointer; /* 1 */
- -webkit-appearance: button; /* 2 */
- *overflow: visible; /* 3 */
-}
-
-/*
- * Re-set default cursor for disabled elements
- */
-
-button[disabled],
-input[disabled] {
- cursor: default;
-}
-
-/*
- * 1. Addresses box sizing set to content-box in IE8/9
- * 2. Removes excess padding in IE8/9
- * 3. Removes excess padding in IE7
- Known issue: excess padding remains in IE6
- */
-
-input[type="checkbox"],
-input[type="radio"] {
- box-sizing: border-box; /* 1 */
- padding: 0; /* 2 */
- *height: 13px; /* 3 */
- *width: 13px; /* 3 */
-}
-
-/*
- * 1. Addresses appearance set to searchfield in S5, Chrome
- * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
- */
-
-input[type="search"] {
- -webkit-appearance: textfield; /* 1 */
- -moz-box-sizing: content-box;
- -webkit-box-sizing: content-box; /* 2 */
- box-sizing: content-box;
-}
-
-/*
- * Removes inner padding and search cancel button in S5, Chrome on OS X
- */
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none;
-}
-
-/*
- * Removes inner padding and border in FF3+
- * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- border: 0;
- padding: 0;
-}
-
-/*
- * 1. Removes default vertical scrollbar in IE6/7/8/9
- * 2. Improves readability and alignment in all browsers
- */
-
-textarea {
- overflow: auto; /* 1 */
- vertical-align: top; /* 2 */
-}
-
-
-/* =============================================================================
- Tables
- ========================================================================== */
-
-/*
- * Remove most spacing between table cells
- */
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
diff --git a/cms/static/sass/views/_updates.scss b/cms/static/sass/views/_updates.scss
index c612985be6..8be09675d1 100644
--- a/cms/static/sass/views/_updates.scss
+++ b/cms/static/sass/views/_updates.scss
@@ -167,6 +167,7 @@
}
.course-handouts {
+ @extend %ui-window;
width: 30%;
padding: 20px 30px;
margin: 0;
diff --git a/cms/templates/base.html b/cms/templates/base.html
index 486290a4be..0689cefab4 100644
--- a/cms/templates/base.html
+++ b/cms/templates/base.html
@@ -3,7 +3,10 @@
<%namespace name='static' file='static_content.html'/>
-
+
+
+
+
@@ -19,10 +22,9 @@
- <%static:css group='base-style'/>
-
-
-
+ <%static:css group='style-vendor'/>
+ <%static:css group='style-app'/>
+ <%static:css group='style-xmodule'/>
<%include file="widgets/segment-io.html" />
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index b2abd43e9b..7be7a3a4a1 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -77,7 +77,7 @@ require(["domReady!", "jquery", "js/collections/course_update", "js/models/modul
-
+
diff --git a/common/static/css/vendor/normalize.css b/common/static/css/vendor/normalize.css
new file mode 100644
index 0000000000..c2de8df942
--- /dev/null
+++ b/common/static/css/vendor/normalize.css
@@ -0,0 +1,406 @@
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+
+/* ==========================================================================
+ HTML5 display definitions
+ ========================================================================== */
+
+/**
+ * Correct `block` display not defined in IE 8/9.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+ display: block;
+}
+
+/**
+ * Correct `inline-block` display not defined in IE 8/9.
+ */
+
+audio,
+canvas,
+video {
+ display: inline-block;
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+ display: none;
+ height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9.
+ * Hide the `template` element in IE, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+ display: none;
+}
+
+/* ==========================================================================
+ Base
+ ========================================================================== */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ * user zoom.
+ */
+
+html {
+ font-family: sans-serif; /* 1 */
+ -ms-text-size-adjust: 100%; /* 2 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+ margin: 0;
+}
+
+/* ==========================================================================
+ Links
+ ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+ background: transparent;
+}
+
+/**
+ * Address `outline` inconsistency between Chrome and other browsers.
+ */
+
+a:focus {
+ outline: thin dotted;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+ outline: 0;
+}
+
+/* ==========================================================================
+ Typography
+ ========================================================================== */
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari 5, and Chrome.
+ */
+
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9, Safari 5, and Chrome.
+ */
+
+abbr[title] {
+ border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+ */
+
+b,
+strong {
+ font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari 5 and Chrome.
+ */
+
+dfn {
+ font-style: italic;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+ height: 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+ background: #ff0;
+ color: #000;
+}
+
+/**
+ * Correct font family set oddly in Safari 5 and Chrome.
+ */
+
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, serif;
+ font-size: 1em;
+}
+
+/**
+ * Improve readability of pre-formatted text in all browsers.
+ */
+
+pre {
+ white-space: pre-wrap;
+}
+
+/**
+ * Set consistent quote types.
+ */
+
+q {
+ quotes: "\201C" "\201D" "\2018" "\2019";
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+ font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sup {
+ top: -0.5em;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+/* ==========================================================================
+ Embedded content
+ ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9.
+ */
+
+img {
+ border: 0;
+}
+
+/**
+ * Correct overflow displayed oddly in IE 9.
+ */
+
+svg:not(:root) {
+ overflow: hidden;
+}
+
+/* ==========================================================================
+ Figures
+ ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari 5.
+ */
+
+figure {
+ margin: 0;
+}
+
+/* ==========================================================================
+ Forms
+ ========================================================================== */
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+ border: 1px solid #c0c0c0;
+ margin: 0 2px;
+ padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+ border: 0; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/**
+ * 1. Correct font family not being inherited in all browsers.
+ * 2. Correct font size not being inherited in all browsers.
+ * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+ */
+
+button,
+input,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 2 */
+ margin: 0; /* 3 */
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+button,
+input {
+ line-height: normal;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
+ * Correct `select` style inheritance in Firefox 4+ and Opera.
+ */
+
+button,
+select {
+ text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ * and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ * `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button; /* 2 */
+ cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+ cursor: default;
+}
+
+/**
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+ box-sizing: border-box; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
+ * (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+ -webkit-appearance: textfield; /* 1 */
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box; /* 2 */
+ box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari 5 and Chrome
+ * on OS X.
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+ border: 0;
+ padding: 0;
+}
+
+/**
+ * 1. Remove default vertical scrollbar in IE 8/9.
+ * 2. Improve readability and alignment in all browsers.
+ */
+
+textarea {
+ overflow: auto; /* 1 */
+ vertical-align: top; /* 2 */
+}
+
+/* ==========================================================================
+ Tables
+ ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}