Skip to content

E
edx-platform
Commit bd1a0d96 by Andy Armstrong
Options

More Sass quality fixes

parent 6387e3a8
Showing with 557 additions and 380 deletions
.stylelintignore
common/lib/xmodule/xmodule/css
common/static/sass/bourbon common/static/sass/bourbon
common/static/xmodule/modules/css
lms/static/sass/vendor lms/static/sass/vendor
common/lib/xmodule/xmodule/css/annotatable/display.scss
...@@ -22,16 +22,18 @@ $annotatable--body-font-size: em(14); ...@@ -22,16 +22,18 @@ $annotatable--body-font-size: em(14);
border-radius: 0.5em; border-radius: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
&.shaded { background-color: #EDEDED; } &.shaded { background-color: #ededed; }
.annotatable-section-title { .annotatable-section-title {
font-weight: bold; font-weight: bold;
a { font-weight: normal; } a { font-weight: normal; }
} }
.annotatable-section-body { .annotatable-section-body {
border-top: 1px solid $annotatable--border-color; border-top: 1px solid $annotatable--border-color;
margin-top: 0.5em; margin-top: 0.5em;
padding-top: 0.5em; padding-top: 0.5em;
@include clearfix(); @include clearfix();
} }
...@@ -40,6 +42,7 @@ $annotatable--body-font-size: em(14); ...@@ -40,6 +42,7 @@ $annotatable--body-font-size: em(14);
margin-left: 4em; margin-left: 4em;
b { font-weight: bold; } b { font-weight: bold; }
i { font-style: italic; } i { font-style: italic; }
code { code {
display: inline; display: inline;
white-space: pre; white-space: pre;
...@@ -58,9 +61,11 @@ $annotatable--body-font-size: em(14); ...@@ -58,9 +61,11 @@ $annotatable--body-font-size: em(14);
.annotatable-span { .annotatable-span {
@extend %ui-fake-link; @extend %ui-fake-link;
display: inline; display: inline;
$highlight_index: 0; $highlight_index: 0;
@each $highlight in ( @each $highlight in (
(yellow rgba(255,255,10,0.3) rgba(255,255,10,0.9)), (yellow rgba(255,255,10,0.3) rgba(255,255,10,0.9)),
(red rgba(178,19,16,0.3) rgba(178,19,16,0.9)), (red rgba(178,19,16,0.3) rgba(178,19,16,0.9)),
...@@ -80,6 +85,7 @@ $annotatable--body-font-size: em(14); ...@@ -80,6 +85,7 @@ $annotatable--body-font-size: em(14);
&.selected { background-color: $selected_color; } &.selected { background-color: $selected_color; }
} }
} }
&.highlight-#{$marker} { &.highlight-#{$marker} {
background-color: $color; background-color: $color;
&.selected { background-color: $selected_color; } &.selected { background-color: $selected_color; }
...@@ -89,6 +95,7 @@ $annotatable--body-font-size: em(14); ...@@ -89,6 +95,7 @@ $annotatable--body-font-size: em(14);
&.hide { &.hide {
cursor: none; cursor: none;
background-color: inherit; background-color: inherit;
.annotatable-icon { .annotatable-icon {
display: none; display: none;
} }
...@@ -113,20 +120,24 @@ $annotatable--body-font-size: em(14); ...@@ -113,20 +120,24 @@ $annotatable--body-font-size: em(14);
background-color: transparent; background-color: transparent;
padding: ($baseline/4) ($baseline/2); padding: ($baseline/4) ($baseline/2);
border: none; border: none;
.ui-tooltip-title { .ui-tooltip-title {
padding: ($baseline/4) 0; padding: ($baseline/4) 0;
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
font-weight: bold; font-weight: bold;
} }
.ui-tooltip-icon { .ui-tooltip-icon {
right: 10px; right: 10px;
background: #333; background: #333;
} }
.ui-state-hover { .ui-state-hover {
color: inherit; color: inherit;
border: 1px solid $gray-l3; border: 1px solid $gray-l3;
} }
} }
.ui-tooltip-content { .ui-tooltip-content {
color: inherit; color: inherit;
font-size: em(14); font-size: em(14);
...@@ -136,16 +147,19 @@ $annotatable--body-font-size: em(14); ...@@ -136,16 +147,19 @@ $annotatable--body-font-size: em(14);
background-color: transparent; background-color: transparent;
border-color: transparent; border-color: transparent;
} }
p { p {
color: inherit; color: inherit;
line-height: normal; line-height: normal;
} }
} }
.ui-tooltip.qtip.ui-tooltip-annotatable { .ui-tooltip.qtip.ui-tooltip-annotatable {
max-width: 375px; max-width: 375px;
.ui-tooltip-content { .ui-tooltip-content {
padding: 0 ($baseline/2); padding: 0 ($baseline/2);
.annotatable-comment { .annotatable-comment {
display: block; display: block;
margin: 0 0 ($baseline/2) 0; margin: 0 0 ($baseline/2) 0;
...@@ -153,6 +167,7 @@ $annotatable--body-font-size: em(14); ...@@ -153,6 +167,7 @@ $annotatable--body-font-size: em(14);
overflow: auto; overflow: auto;
line-height: normal; line-height: normal;
} }
.annotatable-reply { .annotatable-reply {
display: block; display: block;
border-top: 2px solid #333; border-top: 2px solid #333;
...@@ -161,6 +176,7 @@ $annotatable--body-font-size: em(14); ...@@ -161,6 +176,7 @@ $annotatable--body-font-size: em(14);
text-align: center; text-align: center;
} }
} }
&:after { &:after {
content: ''; content: '';
display: inline-block; display: inline-block;
......
common/lib/xmodule/xmodule/css/codemirror/codemirror.scss
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
background: #fff; background: #fff;
font-size: 13px; font-size: 13px;
color: #3c3c3c; color: #3c3c3c;
} }
\ No newline at end of file
common/lib/xmodule/xmodule/css/editor/edit.scss
...@@ -9,13 +9,16 @@ ...@@ -9,13 +9,16 @@
.editor-bar { .editor-bar {
@include clearfix(); @include clearfix();
@include linear-gradient(top, #d4dee8, #c9d5e2); @include linear-gradient(top, #d4dee8, #c9d5e2);
position: relative; position: relative;
padding: ($baseline/4); padding: ($baseline/4);
border-bottom-color: #a5aaaf; border-bottom-color: #a5aaaf;
button { button {
display: inline-block; display: inline-block;
@include float(left); @include float(left);
padding: 3px ($baseline/2) 5px; padding: 3px ($baseline/2) 5px;
margin-left: 7px; margin-left: 7px;
border: 0; border: 0;
...@@ -23,7 +26,7 @@ ...@@ -23,7 +26,7 @@
background: transparent; background: transparent;
.icon { .icon {
height: 21px; height: 21px;
} }
&:hover, &:hover,
...@@ -36,6 +39,7 @@ ...@@ -36,6 +39,7 @@
.editor-tabs { .editor-tabs {
position: absolute; position: absolute;
top: 10px; top: 10px;
@include right(10px); @include right(10px);
@include text-align(left); @include text-align(left);
@include direction(); @include direction();
...@@ -55,7 +59,9 @@ ...@@ -55,7 +59,9 @@
padding: 7px 20px 3px; padding: 7px 20px 3px;
border: 1px solid #a5aaaf; border: 1px solid #a5aaaf;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
@include linear-gradient(top, $transparent 87%, rgba(0, 0, 0, .06)); @include linear-gradient(top, $transparent 87%, rgba(0, 0, 0, .06));
background-color: #e5ecf3; background-color: #e5ecf3;
font-size: 13px; font-size: 13px;
color: #3c3c3c; color: #3c3c3c;
......
common/lib/xmodule/xmodule/css/html/display.scss
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
} }
h1 { h1 {
color: $baseFontColor; color: $baseFontColor;
font: normal 2em/1.4em $sans-serif; font: normal 2em/1.4em $sans-serif;
letter-spacing: 1px; letter-spacing: 1px;
@include margin(0, 0, 1.416em, 0);
} @include margin(0, 0, 1.416em, 0);
}
h2 { h2 {
color: #646464; color: #646464;
...@@ -20,6 +21,7 @@ h2 { ...@@ -20,6 +21,7 @@ h2 {
h3, h4, h5, h6 { h3, h4, h5, h6 {
@include margin(0, 0, ($baseline/2), 0); @include margin(0, 0, ($baseline/2), 0);
font-weight: 600; font-weight: 600;
} }
...@@ -73,6 +75,7 @@ blockquote { ...@@ -73,6 +75,7 @@ blockquote {
ol, ul { ol, ul {
// Using the lower level Bi App Sass mixin to avoid @padding conflicts with bourbon. // Using the lower level Bi App Sass mixin to avoid @padding conflicts with bourbon.
@include bi-app-compact(padding, 0, 0, 0, 1em); @include bi-app-compact(padding, 0, 0, 0, 1em);
margin: 1em 0; margin: 1em 0;
color: $baseFontColor; color: $baseFontColor;
...@@ -152,9 +155,9 @@ th { ...@@ -152,9 +155,9 @@ th {
// modal - image zoom, fill window // modal - image zoom, fill window
.wrapper-modal-image { .wrapper-modal-image {
.modal-ui-icon { .modal-ui-icon {
@extend %ui-fake-link; @extend %ui-fake-link;
position: absolute; position: absolute;
display: block; display: block;
padding: ($baseline/4) 7px; padding: ($baseline/4) 7px;
...@@ -175,6 +178,7 @@ th { ...@@ -175,6 +178,7 @@ th {
.image-link { .image-link {
@extend %ui-fake-link; @extend %ui-fake-link;
position: relative; position: relative;
display: block; display: block;
...@@ -192,6 +196,7 @@ th { ...@@ -192,6 +196,7 @@ th {
.image-modal { .image-modal {
@extend %ui-fake-link; @extend %ui-fake-link;
@extend %ui-depth5; @extend %ui-depth5;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
...@@ -247,9 +252,11 @@ th { ...@@ -247,9 +252,11 @@ th {
&.action-zoom-in { &.action-zoom-in {
margin-right: ($baseline/4); margin-right: ($baseline/4);
} }
&.action-zoom-out { &.action-zoom-out {
margin-left: ($baseline/4); margin-left: ($baseline/4);
} }
&.is-disabled { &.is-disabled {
opacity: 0.5; opacity: 0.5;
cursor: default; cursor: default;
...@@ -275,11 +282,11 @@ th { ...@@ -275,11 +282,11 @@ th {
} }
} }
} }
&.image-is-zoomed { &.image-is-zoomed {
display: block; display: block;
.image-content .image-wrapper { .image-content .image-wrapper {
img { img {
max-width: none; max-width: none;
max-height: none; max-height: none;
......
common/lib/xmodule/xmodule/css/html/edit.scss
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
.CodeMirror { .CodeMirror {
@include box-sizing(border-box); @include box-sizing(border-box);
height: 435px; height: 435px;
} }
......
common/lib/xmodule/xmodule/css/lti/lti.scss
...@@ -12,46 +12,48 @@ div.problem-progress { ...@@ -12,46 +12,48 @@ div.problem-progress {
div.lti { div.lti {
// align center // align center
margin: 0 auto; margin: 0 auto;
.wrapper-lti-link {
@include font-size(14);
background-color: $sidebar-color;
padding: $baseline;
.lti-link {
margin-bottom: 0;
text-align: right;
.link_lti_new_window {
@extend .gray-button;
@include font-size(13);
@include line-height(14);
}
}
}
form.ltiLaunchForm { .wrapper-lti-link {
display: none; @include font-size(14);
}
iframe.ltiLaunchFrame { background-color: $sidebar-color;
width: 100%; padding: $baseline;
height: 800px;
display: block;
border: 0px;
}
h4.problem-feedback-label { .lti-link {
font-weight: 100; margin-bottom: 0;
font-size: em(16); text-align: right;
font-family: "Source Sans", "Open Sans", Verdana, Geneva, sans-serif, sans-serif;
}
div.problem-feedback { .link_lti_new_window {
margin-top: ($baseline/4); @extend .gray-button;
margin-bottom: ($baseline/4);
@include font-size(13);
@include line-height(14);
}
} }
}
form.ltiLaunchForm {
display: none;
}
iframe.ltiLaunchFrame {
width: 100%;
height: 800px;
display: block;
border: 0px;
}
h4.problem-feedback-label {
font-weight: 100;
font-size: em(16);
font-family: "Source Sans", "Open Sans", Verdana, Geneva, sans-serif, sans-serif;
}
div.problem-feedback {
margin-top: ($baseline/4);
margin-bottom: ($baseline/4);
}
} }
common/lib/xmodule/xmodule/css/poll/display.scss
...@@ -10,7 +10,7 @@ div.poll_question { ...@@ -10,7 +10,7 @@ div.poll_question {
} }
.inline { .inline {
display: inline; display: inline;
} }
h3 { h3 {
...@@ -42,7 +42,7 @@ div.poll_question { ...@@ -42,7 +42,7 @@ div.poll_question {
margin-bottom: $baseline; margin-bottom: $baseline;
&.short { &.short {
clear: both; clear: both;
} }
.question { .question {
...@@ -59,6 +59,7 @@ div.poll_question { ...@@ -59,6 +59,7 @@ div.poll_question {
.button { .button {
@extend %ui-fake-link; @extend %ui-fake-link;
-webkit-appearance: none; -webkit-appearance: none;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-webkit-border-image: none; -webkit-border-image: none;
...@@ -94,13 +95,11 @@ div.poll_question { ...@@ -94,13 +95,11 @@ div.poll_question {
/* display: inline-block; */ /* display: inline-block; */
display: inline; display: inline;
float: left; float: left;
font-family: 'Open Sans', Verdana, Geneva, sans-serif; font-family: 'Open Sans', Verdana, Geneva, sans-serif;
font-size: 13px; font-size: 13px;
font-style: normal; font-style: normal;
font-variant: normal; font-variant: normal;
font-weight: bold; font-weight: bold;
letter-spacing: normal; letter-spacing: normal;
line-height: 25.59375px; line-height: 25.59375px;
margin-bottom: ($baseline*0.75); margin-bottom: ($baseline*0.75);
...@@ -113,13 +112,12 @@ div.poll_question { ...@@ -113,13 +112,12 @@ div.poll_question {
text-transform: none; text-transform: none;
vertical-align: top; vertical-align: top;
white-space: pre-line; white-space: pre-line;
width: 25px; width: 25px;
height: 25px; height: 25px;
word-spacing: 0px; word-spacing: 0px;
writing-mode: lr-tb; writing-mode: lr-tb;
} }
.button.answered { .button.answered {
-webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset; -webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
background-color: rgb(29, 157, 217); background-color: rgb(29, 157, 217);
...@@ -136,6 +134,7 @@ div.poll_question { ...@@ -136,6 +134,7 @@ div.poll_question {
.text { .text {
@extend %ui-fake-link; @extend %ui-fake-link;
display: inline; display: inline;
float: left; float: left;
width: 80%; width: 80%;
......
common/lib/xmodule/xmodule/css/problem/edit.scss
.editor-bar { .editor-bar {
.editor-tabs { .editor-tabs {
.advanced-toggle { .advanced-toggle {
height: auto; height: auto;
margin-top: -4px; margin-top: -4px;
...@@ -47,9 +45,12 @@ ...@@ -47,9 +45,12 @@
left: 100%; left: 100%;
width: 0; width: 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
@include linear-gradient(left, $shadow-l1, $transparent 4px); @include linear-gradient(left, $shadow-l1, $transparent 4px);
background-color: $white; background-color: $white;
overflow: hidden; overflow: hidden;
@include transition(width .3s linear 0s); @include transition(width .3s linear 0s);
&.shown { &.shown {
...@@ -70,6 +71,7 @@ ...@@ -70,6 +71,7 @@
.row { .row {
@include clearfix(); @include clearfix();
padding-bottom: 5px !important; padding-bottom: 5px !important;
margin-bottom: 10px !important; margin-bottom: 10px !important;
border-bottom: 1px solid #ddd !important; border-bottom: 1px solid #ddd !important;
...@@ -88,7 +90,7 @@ ...@@ -88,7 +90,7 @@
margin-right: 30px; margin-right: 30px;
.icon { .icon {
height: ($baseline * 1.5); height: ($baseline * 1.5);
} }
} }
} }
...@@ -105,8 +107,8 @@ ...@@ -105,8 +107,8 @@
} }
.problem-editor { .problem-editor {
// adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror // adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror
.markdown-box+.CodeMirror { .markdown-box+.CodeMirror {
padding: 10px; padding: 10px;
} }
} }
......
common/lib/xmodule/xmodule/css/sequence/display.scss
...@@ -9,6 +9,7 @@ $seq-nav-height: 44px; ...@@ -9,6 +9,7 @@ $seq-nav-height: 44px;
// repeated extends - needed since LMS styling was referenced // repeated extends - needed since LMS styling was referenced
.block-link { .block-link {
@include border-left(1px solid $seq-nav-border-color); @include border-left(1px solid $seq-nav-border-color);
display: block; display: block;
&:hover, &:focus { &:hover, &:focus {
...@@ -18,6 +19,7 @@ $seq-nav-height: 44px; ...@@ -18,6 +19,7 @@ $seq-nav-height: 44px;
.topbar { .topbar {
@include clearfix(); @include clearfix();
border-bottom: 1px solid $seq-nav-border-color; border-bottom: 1px solid $seq-nav-border-color;
@media print { @media print {
...@@ -27,6 +29,7 @@ $seq-nav-height: 44px; ...@@ -27,6 +29,7 @@ $seq-nav-height: 44px;
a { a {
&.block-link { &.block-link {
@include border-left(1px solid $seq-nav-border-color); @include border-left(1px solid $seq-nav-border-color);
display: block; display: block;
&:hover, &:focus { &:hover, &:focus {
...@@ -43,7 +46,6 @@ $seq-nav-height: 44px; ...@@ -43,7 +46,6 @@ $seq-nav-height: 44px;
background-repeat: no-repeat; background-repeat: no-repeat;
border: none; border: none;
border-radius: 0; border-radius: 0;
background-clip: border-box; background-clip: border-box;
box-shadow: none; box-shadow: none;
box-sizing: content-box; box-sizing: content-box;
...@@ -57,6 +59,7 @@ $seq-nav-height: 44px; ...@@ -57,6 +59,7 @@ $seq-nav-height: 44px;
.sequence-nav { .sequence-nav {
@extend .topbar; @extend .topbar;
margin: 0 0 $baseline 0; margin: 0 0 $baseline 0;
position: relative; position: relative;
border-bottom: none; border-bottom: none;
...@@ -74,6 +77,7 @@ $seq-nav-height: 44px; ...@@ -74,6 +77,7 @@ $seq-nav-height: 44px;
.sequence-list-wrapper { .sequence-list-wrapper {
@extend %ui-depth2; @extend %ui-depth2;
position: relative; position: relative;
height: 100%; height: 100%;
flex-grow: 1; flex-grow: 1;
...@@ -151,7 +155,9 @@ $seq-nav-height: 44px; ...@@ -151,7 +155,9 @@ $seq-nav-height: 44px;
.sequence-tooltip { .sequence-tooltip {
@include text-align(left); @include text-align(left);
@extend %ui-depth2; @extend %ui-depth2;
margin-top: ($baseline/5); margin-top: ($baseline/5);
background: $seq-nav-tooltip-color; background: $seq-nav-tooltip-color;
color: $white; color: $white;
...@@ -176,6 +182,7 @@ $seq-nav-height: 44px; ...@@ -176,6 +182,7 @@ $seq-nav-height: 44px;
&::after { &::after {
@include transform(rotate(45deg)); @include transform(rotate(45deg));
@include right(18px); @include right(18px);
background: $seq-nav-tooltip-color; background: $seq-nav-tooltip-color;
content: " "; content: " ";
display: block; display: block;
...@@ -197,6 +204,7 @@ $seq-nav-height: 44px; ...@@ -197,6 +204,7 @@ $seq-nav-height: 44px;
.sequence-nav-button { .sequence-nav-button {
@extend %ui-depth3; @extend %ui-depth3;
display: block; display: block;
top: 0; top: 0;
height: 100%; height: 100%;
......
common/lib/xmodule/xmodule/css/tabs/codemirror.scss
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
.CodeMirror { .CodeMirror {
@include box-sizing(border-box); @include box-sizing(border-box);
width: 100%; width: 100%;
position: relative; position: relative;
height: 379px; height: 379px;
......
common/lib/xmodule/xmodule/css/tabs/tabs.scss
...@@ -18,11 +18,13 @@ ...@@ -18,11 +18,13 @@
.editor-with-tabs { .editor-with-tabs {
@include clearfix(); @include clearfix();
position: relative; position: relative;
.edit-header { .edit-header {
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 18px $baseline; padding: 18px $baseline;
top: 0 !important; // ugly override for second level tab override top: 0 !important; // ugly override for second level tab override
right: 0; right: 0;
...@@ -62,17 +64,19 @@ ...@@ -62,17 +64,19 @@
margin-left: 8px; margin-left: 8px;
a.tab { a.tab {
@include font-size(14); @include font-size(14);
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
border: 1px solid $blue-d1;
border-radius: 3px; border: 1px solid $blue-d1;
padding: ($baseline/4) ($baseline); border-radius: 3px;
background-color: $blue; padding: ($baseline/4) ($baseline);
font-weight: bold; background-color: $blue;
color: $white; font-weight: bold;
color: $white;
&.current { &.current {
@include linear-gradient($blue, $blue); @include linear-gradient($blue, $blue);
color: $blue-d1; color: $blue-d1;
box-shadow: inset 0 1px 2px 1px $shadow-l1; box-shadow: inset 0 1px 2px 1px $shadow-l1;
background-color: $blue-d4; background-color: $blue-d4;
...@@ -81,7 +85,7 @@ ...@@ -81,7 +85,7 @@
&:hover, &:focus { &:hover, &:focus {
box-shadow: inset 0 1px 2px 1px $shadow; box-shadow: inset 0 1px 2px 1px $shadow;
background-image: linear-gradient(#009FE6, #009FE6) !important; background-image: linear-gradient(#009fe6, #009fe6) !important;
} }
} }
} }
......
common/lib/xmodule/xmodule/css/video/accessible_menu.scss
...@@ -23,6 +23,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -23,6 +23,7 @@ $a11y--blue-s1: saturate($blue,15%);
.a11y-menu-list { .a11y-menu-list {
@extend %ui-depth3; @extend %ui-depth3;
top: 100%; top: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -34,6 +35,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -34,6 +35,7 @@ $a11y--blue-s1: saturate($blue,15%);
li { li {
@extend %ui-fake-link; @extend %ui-fake-link;
margin: 0; margin: 0;
padding: 0; padding: 0;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
...@@ -92,6 +94,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -92,6 +94,7 @@ $a11y--blue-s1: saturate($blue,15%);
> a { > a {
@include transition(all $tmg-f2 ease-in-out 0s); @include transition(all $tmg-f2 ease-in-out 0s);
@include font-size(12); @include font-size(12);
display: block; display: block;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
background-color: $very-light-text; background-color: $very-light-text;
...@@ -105,6 +108,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -105,6 +108,7 @@ $a11y--blue-s1: saturate($blue,15%);
&:after { &:after {
@extend %use-font-awesome; @extend %use-font-awesome;
content: "\f0d7"; content: "\f0d7";
position: absolute; position: absolute;
right: ($baseline*0.5); right: ($baseline*0.5);
...@@ -135,6 +139,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -135,6 +139,7 @@ $a11y--blue-s1: saturate($blue,15%);
.contextmenu, .submenu { .contextmenu, .submenu {
@extend %ui-depth5; @extend %ui-depth5;
border: 1px solid #333; border: 1px solid #333;
background: $white; background: $white;
color: #333; color: #333;
...@@ -149,7 +154,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -149,7 +154,7 @@ $a11y--blue-s1: saturate($blue,15%);
white-space: nowrap; white-space: nowrap;
&.is-opened { &.is-opened {
display: block; display: block;
} }
.menu-item, .submenu-item { .menu-item, .submenu-item {
...@@ -158,8 +163,8 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -158,8 +163,8 @@ $a11y--blue-s1: saturate($blue,15%);
outline: none; outline: none;
& > span { & > span {
color: #333; color: #333;
} }
&:first-child { &:first-child {
border-top: none; border-top: none;
...@@ -217,6 +222,7 @@ $a11y--blue-s1: saturate($blue,15%); ...@@ -217,6 +222,7 @@ $a11y--blue-s1: saturate($blue,15%);
.overlay { .overlay {
@extend %ui-depth4; @extend %ui-depth4;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
......
common/lib/xmodule/xmodule/css/word_cloud/display.scss
.input-cloud { .input-cloud {
margin: ($baseline/4); margin: ($baseline/4);
} }
.result_cloud_section { .result_cloud_section {
display: none; display: none;
width: 0px; width: 0px;
height: 0px; height: 0px;
} }
.result_cloud_section.active { .result_cloud_section.active {
display: block; display: block;
width: 100%; width: 100%;
height: auto; height: auto;
margin-top: 1em; margin-top: 1em;
h3 { h3 {
font-size: 100%; font-size: 100%;
} }
} }
.your_words{ .your_words{
font-size: 0.85em; font-size: 0.85em;
display: block; display: block;
} }
common/static/sass/_mixins-inherited.scss
...@@ -26,50 +26,57 @@ ...@@ -26,50 +26,57 @@
// inherited - dividers // inherited - dividers
.faded-hr-divider { .faded-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%, @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%, rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0))); rgba(200,200,200, 0)));
height: 1px; height: 1px;
width: 100%; width: 100%;
} }
.faded-hr-divider-medium { .faded-hr-divider-medium {
@include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%, @include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%,
rgba(240,240,240, 1) 50%, rgba(240,240,240, 1) 50%,
rgba(240,240,240, 0))); rgba(240,240,240, 0)));
height: 1px; height: 1px;
width: 100%; width: 100%;
} }
.faded-hr-divider-light { .faded-hr-divider-light {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%, @include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.8) 50%, rgba(255,255,255, 0.8) 50%,
rgba(255,255,255, 0))); rgba(255,255,255, 0)));
height: 1px; height: 1px;
width: 100%; width: 100%;
} }
.faded-vertical-divider { .faded-vertical-divider {
@include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%, @include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%, rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0))); rgba(200,200,200, 0)));
height: 100%; height: 100%;
width: 1px; width: 1px;
} }
.faded-vertical-divider-light { .faded-vertical-divider-light {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%, @include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.6) 50%, rgba(255,255,255, 0.6) 50%,
rgba(255,255,255, 0))); rgba(255,255,255, 0)));
height: 100%; height: 100%;
width: 1px; width: 1px;
} }
.vertical-divider { .vertical-divider {
@extend .faded-vertical-divider; @extend .faded-vertical-divider;
position: relative; position: relative;
&::after { &::after {
@extend .faded-vertical-divider-light; @extend .faded-vertical-divider-light;
content: ""; content: "";
display: block; display: block;
position: absolute; position: absolute;
...@@ -79,11 +86,14 @@ ...@@ -79,11 +86,14 @@
.horizontal-divider { .horizontal-divider {
border: none; border: none;
@extend .faded-hr-divider; @extend .faded-hr-divider;
position: relative; position: relative;
&::after { &::after {
@extend .faded-hr-divider-light; @extend .faded-hr-divider-light;
content: ""; content: "";
display: block; display: block;
position: absolute; position: absolute;
...@@ -93,13 +103,15 @@ ...@@ -93,13 +103,15 @@
.fade-right-hr-divider { .fade-right-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%, @include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1))); rgba(200,200,200, 1)));
border: none; border: none;
} }
.fade-left-hr-divider { .fade-left-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%, @include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%,
rgba(200,200,200, 0))); rgba(200,200,200, 0)));
border: none; border: none;
} }
...@@ -108,6 +120,7 @@ ...@@ -108,6 +120,7 @@
// inherited - ui // inherited - ui
.window { .window {
@include clearfix(); @include clearfix();
box-shadow: 0 1px 1px $shadow-l1; box-shadow: 0 1px 1px $shadow-l1;
border-radius: 3px; border-radius: 3px;
margin-bottom: $baseline; margin-bottom: $baseline;
...@@ -120,8 +133,10 @@ ...@@ -120,8 +133,10 @@
// mixins - grandfathered // mixins - grandfathered
@mixin button { @mixin button {
@include transition(background-color 0.15s, box-shadow 0.15s); @include transition(background-color 0.15s, box-shadow 0.15s);
@extend %t-action3; @extend %t-action3;
@extend %t-strong; @extend %t-strong;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset, 0 0 0 $transparent; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset, 0 0 0 $transparent;
display: inline-block; display: inline-block;
padding: ($baseline/5) $baseline ($baseline/4); padding: ($baseline/5) $baseline ($baseline/4);
...@@ -133,6 +148,7 @@ ...@@ -133,6 +148,7 @@
color: $gray-d1 !important; color: $gray-d1 !important;
pointer-events: none; pointer-events: none;
cursor: none; cursor: none;
&:hover, &:focus { &:hover, &:focus {
box-shadow: 0 0 0 0 !important; box-shadow: 0 0 0 0 !important;
} }
...@@ -146,6 +162,7 @@ ...@@ -146,6 +162,7 @@
@mixin green-button { @mixin green-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset;
border: 1px solid $uxpl-green-base; border: 1px solid $uxpl-green-base;
border-radius: 3px; border-radius: 3px;
...@@ -168,6 +185,7 @@ ...@@ -168,6 +185,7 @@
@mixin blue-button { @mixin blue-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
border: 1px solid $uxpl-blue-base; border: 1px solid $uxpl-blue-base;
border-radius: 3px; border-radius: 3px;
background-color: $uxpl-blue-base; background-color: $uxpl-blue-base;
...@@ -189,6 +207,7 @@ ...@@ -189,6 +207,7 @@
@mixin red-button { @mixin red-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
border: 1px solid $red-d1; border: 1px solid $red-d1;
border-radius: 3px; border-radius: 3px;
background-color: $red; background-color: $red;
...@@ -210,6 +229,7 @@ ...@@ -210,6 +229,7 @@
@mixin pink-button { @mixin pink-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
border: 1px solid $pink-d1; border: 1px solid $pink-d1;
border-radius: 3px; border-radius: 3px;
background-color: $pink; background-color: $pink;
...@@ -231,6 +251,7 @@ ...@@ -231,6 +251,7 @@
@mixin orange-button { @mixin orange-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0) 60%); @include linear-gradient(top, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0) 60%);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset;
border: 1px solid $orange-d1; border: 1px solid $orange-d1;
border-radius: 3px; border-radius: 3px;
...@@ -253,6 +274,7 @@ ...@@ -253,6 +274,7 @@
@mixin white-button { @mixin white-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0));
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset;
border: 1px solid $mediumGrey; border: 1px solid $mediumGrey;
border-radius: 3px; border-radius: 3px;
...@@ -269,6 +291,7 @@ ...@@ -269,6 +291,7 @@
@mixin grey-button { @mixin grey-button {
@include button; @include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset; box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset;
border: 1px solid $gray-d2; border: 1px solid $gray-d2;
border-radius: 3px; border-radius: 3px;
...@@ -284,6 +307,7 @@ ...@@ -284,6 +307,7 @@
.gray-button { .gray-button {
@include button; @include button;
@include linear-gradient(top, $white-t1, rgba(255, 255, 255, 0)); @include linear-gradient(top, $white-t1, rgba(255, 255, 255, 0));
box-shadow: 0 1px 0 $white-t1 inset; box-shadow: 0 1px 0 $white-t1 inset;
border: 1px solid $gray-d1; border: 1px solid $gray-d1;
border-radius: 3px; border-radius: 3px;
...@@ -319,6 +343,7 @@ ...@@ -319,6 +343,7 @@
h5 { h5 {
@extend %t-strong; @extend %t-strong;
margin-bottom: 8px; margin-bottom: 8px;
color: $white; color: $white;
} }
...@@ -331,11 +356,13 @@ ...@@ -331,11 +356,13 @@
.save-button { .save-button {
@include blue-button; @include blue-button;
margin-top: 0; margin-top: 0;
} }
.cancel-button { .cancel-button {
@include white-button; @include white-button;
margin-top: 0; margin-top: 0;
} }
} }
...@@ -345,6 +372,7 @@ ...@@ -345,6 +372,7 @@
// sunsetted mixins // sunsetted mixins
@mixin active { @mixin active {
@include linear-gradient(top, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0)); @include linear-gradient(top, rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0));
box-shadow: 0 -1px 0 $shadow inset, 0 1px 0 $white inset; box-shadow: 0 -1px 0 $shadow inset, 0 1px 0 $white inset;
background-color: rgba(255, 255, 255, 0.3); background-color: rgba(255, 255, 255, 0.3);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
......
common/static/sass/assets/_anims.scss
...@@ -98,11 +98,13 @@ ...@@ -98,11 +98,13 @@
@include keyframes(bounceIn) { @include keyframes(bounceIn) {
0% { 0% {
opacity: 0.0; opacity: 0.0;
@include transform(scale(0.3)); @include transform(scale(0.3));
} }
50% { 50% {
opacity: 1.0; opacity: 1.0;
@include transform(scale(1.05)); @include transform(scale(1.05));
} }
...@@ -119,11 +121,13 @@ ...@@ -119,11 +121,13 @@
50% { 50% {
opacity: 1.0; opacity: 1.0;
@include transform(scale(1.05)); @include transform(scale(1.05));
} }
100% { 100% {
opacity: 0.0; opacity: 0.0;
@include transform(scale(0.3)); @include transform(scale(0.3));
} }
} }
...@@ -144,11 +148,11 @@ ...@@ -144,11 +148,11 @@
// flash - double // flash - double
@include keyframes(flashDouble) { @include keyframes(flashDouble) {
0%, 50%, 100% { 0%, 50%, 100% {
opacity: 1.0; opacity: 1.0;
} }
25%, 75% { 25%, 75% {
opacity: 0.0; opacity: 0.0;
} }
} }
common/static/sass/edx-pattern-library-shims/base/_variables.scss
...@@ -61,6 +61,7 @@ $spacing-horizontal: ( ...@@ -61,6 +61,7 @@ $spacing-horizontal: (
} }
@warn "Unknown `#{$key}` in $spacing-vertical."; @warn "Unknown `#{$key}` in $spacing-vertical.";
@return null; @return null;
} }
...@@ -71,6 +72,7 @@ $spacing-horizontal: ( ...@@ -71,6 +72,7 @@ $spacing-horizontal: (
} }
@warn "Unknown `#{$key}` in $spacing-horizontal."; @warn "Unknown `#{$key}` in $spacing-horizontal.";
@return null; @return null;
} }
...@@ -104,6 +106,7 @@ $font-sizes: ( ...@@ -104,6 +106,7 @@ $font-sizes: (
} }
@warn "Unknown `#{$key}` in $font-sizes."; @warn "Unknown `#{$key}` in $font-sizes.";
@return null; @return null;
} }
...@@ -114,6 +117,7 @@ $font-sizes: ( ...@@ -114,6 +117,7 @@ $font-sizes: (
} }
@warn "Unknown `#{$key}` in $font-weights."; @warn "Unknown `#{$key}` in $font-weights.";
@return null; @return null;
} }
...@@ -233,8 +237,10 @@ $btn-small-padding-horizontal: spacing-horizontal(small); ...@@ -233,8 +237,10 @@ $btn-small-padding-horizontal: spacing-horizontal(small);
@mixin notification-by-type($color) { @mixin notification-by-type($color) {
border-top: 3px solid $color; border-top: 3px solid $color;
.icon { .icon {
@include margin-right(3 * $baseline/ 4); @include margin-right(3 * $baseline/ 4);
color: $color; color: $color;
} }
} }
......
common/static/sass/neat/functions/_new-breakpoint.scss
@function new-breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) { @function new-breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) {
@if length($query) == 1 { @if length($query) == 1 {
$query: $default-feature nth($query, 1) $total-columns; $query: $default-feature nth($query, 1) $total-columns;
} }
......
common/static/sass/neat/functions/_private.scss
...@@ -31,11 +31,13 @@ ...@@ -31,11 +31,13 @@
@function container-span($span: $span) { @function container-span($span: $span) {
@if length($span) == 3 { @if length($span) == 3 {
$container-columns: nth($span, 3); $container-columns: nth($span, 3);
@return $container-columns; @return $container-columns;
} }
@else if length($span) == 2 { @else if length($span) == 2 {
$container-columns: nth($span, 2); $container-columns: nth($span, 2);
@return $container-columns; @return $container-columns;
} }
...@@ -49,11 +51,13 @@ ...@@ -49,11 +51,13 @@
@if length($shift) == 3 { @if length($shift) == 3 {
$container-columns: nth($shift, 3); $container-columns: nth($shift, 3);
@return $container-columns; @return $container-columns;
} }
@else if length($shift) == 2 { @else if length($shift) == 2 {
$container-columns: nth($shift, 2); $container-columns: nth($shift, 2);
@return $container-columns; @return $container-columns;
} }
...@@ -95,7 +99,9 @@ ...@@ -95,7 +99,9 @@
@if $layout == LTR or $layout == RTL { @if $layout == LTR or $layout == RTL {
$direction: direction-from-layout($layout); $direction: direction-from-layout($layout);
} @else { }
@else {
$direction: direction-from-layout($default); $direction: direction-from-layout($default);
} }
...@@ -107,7 +113,9 @@ ...@@ -107,7 +113,9 @@
@if $layout == LTR { @if $layout == LTR {
$direction: right; $direction: right;
} @else { }
@else {
$direction: left; $direction: left;
} }
......
common/static/sass/neat/grid/_media.scss
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
@media screen and ($default-feature: nth($query, 1)) { @media screen and ($default-feature: nth($query, 1)) {
$default-grid-columns: $grid-columns; $default-grid-columns: $grid-columns;
$grid-columns: $total-columns !global; $grid-columns: $total-columns !global;
@content; @content;
$grid-columns: $default-grid-columns !global; $grid-columns: $default-grid-columns !global;
} }
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
} }
$i: 1; $i: 1;
@while $i <= $loopTo { @while $i <= $loopTo {
$mediaQuery: $mediaQuery + '(' + nth($query, $i) + ': ' + nth($query, $i + 1) + ') '; $mediaQuery: $mediaQuery + '(' + nth($query, $i) + ': ' + nth($query, $i + 1) + ') ';
......
common/static/sass/neat/grid/_omega.scss
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
@if $direction != default { @if $direction != default {
@warn "The omega mixin will no longer take a $direction argument. To change the layout direction, use row($direction) or set $default-layout-direction instead." @warn "The omega mixin will no longer take a $direction argument. To change the layout direction, use row($direction) or set $default-layout-direction instead."
} @else { }
@else {
$direction: get-direction($layout-direction, $default-layout-direction); $direction: get-direction($layout-direction, $default-layout-direction);
} }
......
common/static/sass/neat/grid/_outer-container.scss
@mixin outer-container { @mixin outer-container {
@include clearfix(); @include clearfix();
max-width: $max-width; max-width: $max-width;
margin: { margin: {
left: auto; left: auto;
......
common/static/sass/neat/grid/_pad.scss
@mixin pad($padding: flex-gutter()) { @mixin pad($padding: flex-gutter()) {
$padding-list: null; $padding-list: null;
@each $value in $padding { @each $value in $padding {
$value: if($value == 'default', flex-gutter(), $value); $value: if($value == 'default', flex-gutter(), $value);
$padding-list: join($padding-list, $value); $padding-list: join($padding-list, $value);
} }
padding: $padding-list; padding: $padding-list;
} }
common/static/sass/neat/grid/_private.scss
...@@ -8,11 +8,13 @@ $layout-direction: nil !default; ...@@ -8,11 +8,13 @@ $layout-direction: nil !default;
@function flex-grid($columns, $container-columns: $fg-max-columns) { @function flex-grid($columns, $container-columns: $fg-max-columns) {
$width: $columns * $fg-column + ($columns - 1) * $fg-gutter; $width: $columns * $fg-column + ($columns - 1) * $fg-gutter;
$container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
@return percentage($width / $container-width); @return percentage($width / $container-width);
} }
@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) { @function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) {
$container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter; $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
@return percentage($gutter / $container-width); @return percentage($gutter / $container-width);
} }
...@@ -23,7 +25,9 @@ $layout-direction: nil !default; ...@@ -23,7 +25,9 @@ $layout-direction: nil !default;
@function get-parent-columns($columns) { @function get-parent-columns($columns) {
@if $columns != $grid-columns { @if $columns != $grid-columns {
$parent-columns: $columns !global; $parent-columns: $columns !global;
} @else { }
@else {
$parent-columns: $grid-columns !global; $parent-columns: $grid-columns !global;
} }
...@@ -35,7 +39,9 @@ $layout-direction: nil !default; ...@@ -35,7 +39,9 @@ $layout-direction: nil !default;
@if $container-is-display-table == true { @if $container-is-display-table == true {
$display-table: true; $display-table: true;
} @else if $display == table { }
@else if $display == table {
$display-table: true; $display-table: true;
} }
......
common/static/sass/neat/grid/_row.scss
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
@if $display == table { @if $display == table {
display: table; display: table;
@include fill-parent; @include fill-parent;
table-layout: fixed; table-layout: fixed;
$container-display-table: true !global; $container-display-table: true !global;
} }
......
common/static/sass/neat/grid/_span-columns.scss
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
@if $display-table { @if $display-table {
display: table-cell; display: table-cell;
width: percentage($columns / $container-columns); width: percentage($columns / $container-columns);
} @else { }
@else {
float: #{$opposite-direction}; float: #{$opposite-direction};
@if $display != no-display { @if $display != no-display {
...@@ -31,7 +33,9 @@ ...@@ -31,7 +33,9 @@
width: flex-grid($columns, $container-columns); width: flex-grid($columns, $container-columns);
} }
} @else { }
@else {
margin-#{$direction}: flex-gutter($container-columns); margin-#{$direction}: flex-gutter($container-columns);
width: flex-grid($columns, $container-columns); width: flex-grid($columns, $container-columns);
......
common/static/sass/neat/grid/_to-deprecate.scss
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
@media screen and ($default-feature: nth($query, 1)) { @media screen and ($default-feature: nth($query, 1)) {
$default-grid-columns: $grid-columns; $default-grid-columns: $grid-columns;
$grid-columns: $total-columns; $grid-columns: $total-columns;
@content; @content;
$grid-columns: $default-grid-columns; $grid-columns: $default-grid-columns;
} }
...@@ -14,6 +15,7 @@ ...@@ -14,6 +15,7 @@
@media screen and (nth($query, 1): nth($query, 2)) { @media screen and (nth($query, 1): nth($query, 2)) {
$default-grid-columns: $grid-columns; $default-grid-columns: $grid-columns;
$grid-columns: $total-columns; $grid-columns: $total-columns;
@content; @content;
$grid-columns: $default-grid-columns; $grid-columns: $default-grid-columns;
} }
...@@ -23,6 +25,7 @@ ...@@ -23,6 +25,7 @@
@media screen and (nth($query, 1): nth($query, 2)) { @media screen and (nth($query, 1): nth($query, 2)) {
$default-grid-columns: $grid-columns; $default-grid-columns: $grid-columns;
$grid-columns: nth($query, 3); $grid-columns: nth($query, 3);
@content; @content;
$grid-columns: $default-grid-columns; $grid-columns: $default-grid-columns;
} }
...@@ -32,6 +35,7 @@ ...@@ -32,6 +35,7 @@
@media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) { @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
$default-grid-columns: $grid-columns; $default-grid-columns: $grid-columns;
$grid-columns: $total-columns; $grid-columns: $total-columns;
@content; @content;
$grid-columns: $default-grid-columns; $grid-columns: $default-grid-columns;
} }
...@@ -41,6 +45,7 @@ ...@@ -41,6 +45,7 @@
@media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) { @media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
$default-grid-columns: $grid-columns; $default-grid-columns: $grid-columns;
$grid-columns: nth($query, 5); $grid-columns: nth($query, 5);
@content; @content;
$grid-columns: $default-grid-columns; $grid-columns: $default-grid-columns;
} }
...@@ -53,5 +58,6 @@ ...@@ -53,5 +58,6 @@
@mixin nth-omega($nth, $display: block, $direction: default) { @mixin nth-omega($nth, $display: block, $direction: default) {
@warn "The nth-omega() mixin is deprecated. Please use omega() instead."; @warn "The nth-omega() mixin is deprecated. Please use omega() instead.";
@include omega($nth $display, $direction); @include omega($nth $display, $direction);
} }
common/static/sass/neat/grid/_visual-grid.scss
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
body:before { body:before {
content: ''; content: '';
display: inline-block; display: inline-block;
@include grid-column-gradient(gradient-stops($grid-columns)); @include grid-column-gradient(gradient-stops($grid-columns));
height: 100%; height: 100%;
left: 0; left: 0;
margin: 0 auto; margin: 0 auto;
......
common/static/sass/neat/settings/_visual-grid.scss
$visual-grid: false !default; // Display the base grid $visual-grid: false !default; // Display the base grid
$visual-grid-color: #EEE !default; $visual-grid-color: #eee !default;
$visual-grid-index: back !default; // Show grid behind content (back) or overlay it over the content (front) $visual-grid-index: back !default; // Show grid behind content (back) or overlay it over the content (front)
$visual-grid-opacity: 0.4 !default; $visual-grid-opacity: 0.4 !default;
$visual-grid-breakpoints: () !default; $visual-grid-breakpoints: () !default;
common/test/test-theme/cms/static/sass/partials/_variables.scss
...@@ -262,5 +262,5 @@ $sans-serif: $f-sans-serif; ...@@ -262,5 +262,5 @@ $sans-serif: $f-sans-serif;
$body-line-height: golden-ratio(.875em, 1); $body-line-height: golden-ratio(.875em, 1);
// carried over from LMS for xmodules // carried over from LMS for xmodules
$action-primary-active-bg: #1AA1DE; // $m-blue $action-primary-active-bg: #1aa1de; // $m-blue
$very-light-text: $white; $very-light-text: $white;
lms/static/certificates/sass/_base.scss
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
// #BASE // #BASE
// ------------------------------ // ------------------------------
html, body { html, body {
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
background: $white; background: $white;
} }
// ------------------------------ // ------------------------------
......
lms/static/certificates/sass/_config.scss
...@@ -16,14 +16,13 @@ $cert-decorative-color-emphasized: palette(grayscale, accent); ...@@ -16,14 +16,13 @@ $cert-decorative-color-emphasized: palette(grayscale, accent);
// typography: config // typography: config
@include font-face( @include font-face(
'Domine', 'Domine',
'../../certificates/fonts/Domine/Domine-Regular-webfont', '../../certificates/fonts/Domine/Domine-Regular-webfont',
400, 400,
$file-formats: woff woff2 ttf $file-formats: woff woff2 ttf
); );
@include font-face( @include font-face(
'Domine', 'Domine',
'../../certificates/fonts/Domine/Domine-Bold-webfont', '../../certificates/fonts/Domine/Domine-Bold-webfont',
700, 700,
$file-formats: woff woff2 ttf $file-formats: woff woff2 ttf
......
lms/static/certificates/sass/_utilities.scss
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
// ------------------------------ // ------------------------------
// visual dividers // visual dividers
%divider-1 { %divider-1 {
border-bottom-width: rem(4); border-bottom-width: rem(4);
border-bottom-style: solid; border-bottom-style: solid;
} }
%divider-2 { %divider-2 {
border-bottom-width: rem(2); border-bottom-width: rem(2);
border-bottom-style: solid; border-bottom-style: solid;
} }
lms/static/certificates/sass/_views.scss
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
// #INVALID // #INVALID
// ------------------------------ // ------------------------------
.wrapper-content.status-invalid { .wrapper-content.status-invalid {
@extend %layout-wrapper; @extend %layout-wrapper;
.wrapper-content-grid { .wrapper-content-grid {
@extend %layout; @extend %layout;
} }
.content-main { .content-main {
margin-bottom: spacing-vertical(base); margin-bottom: spacing-vertical(base);
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
} }
.content-secondary { .content-secondary {
@media(min-width: $bp-screen-md) { @media(min-width: $bp-screen-md) {
@include span(3, before); @include span(3, before);
} }
......
lms/static/certificates/sass/main-ltr.scss
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// Load the LTR version of the edX Pattern Library // Load the LTR version of the edX Pattern Library
$pattern-library-path: '../../edx-pattern-library' !default; $pattern-library-path: '../../edx-pattern-library' !default;
@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-ltr'; @import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-ltr';
// Load the shared build // Load the shared build
......
lms/static/certificates/sass/main-rtl.scss
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// Load the RTL version of the edX Pattern Library // Load the RTL version of the edX Pattern Library
$pattern-library-path: '../../edx-pattern-library' !default; $pattern-library-path: '../../edx-pattern-library' !default;
@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-rtl'; @import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-rtl';
// Load the shared build // Load the shared build
......
lms/static/sass/base/_animations.scss
...@@ -303,11 +303,11 @@ ...@@ -303,11 +303,11 @@
} }
} }
@-webkit-keyframes fade-in-animation{ @include fade-in-keyframes; } @-webkit-keyframes fade-in-animation { @include fade-in-keyframes; }
@-moz-keyframes fade-in-animation{ @include fade-in-keyframes; } @-moz-keyframes fade-in-animation { @include fade-in-keyframes; }
@keyframes fade-in-animation{ @include fade-in-keyframes; } @keyframes fade-in-animation { @include fade-in-keyframes; }
// +utility animations // +utility animations
......
lms/static/sass/base/_base.scss
...@@ -12,7 +12,7 @@ html, body { ...@@ -12,7 +12,7 @@ html, body {
line-height: 1em; line-height: 1em;
} }
html{ html {
background: white; background: white;
} }
......
lms/static/sass/course/_auto-cert.scss
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
.has-actions { .has-actions {
.msg-content { .msg-content {
width: flex-grid(9,12); width: flex-grid(9, 12);
} }
.msg-actions { .msg-actions {
@extend %t-copy-base; @extend %t-copy-base;
display: inline-block; display: inline-block;
width: flex-grid(3,12); width: flex-grid(3, 12);
.btn { .btn {
@extend %btn-primary-blue; @extend %btn-primary-blue;
......
lms/static/sass/course/_info.scss
...@@ -5,7 +5,7 @@ $notification-highlight-border-color: $uxpl-green-base !default; ...@@ -5,7 +5,7 @@ $notification-highlight-border-color: $uxpl-green-base !default;
$lms-border-color: $uxpl-gray-background !default; $lms-border-color: $uxpl-gray-background !default;
$notification-background: rgb(255, 255, 255) !default $notification-background: rgb(255, 255, 255) !default
.home{ .home {
@include clearfix(); @include clearfix();
max-width: 1140px; max-width: 1140px;
......
lms/static/sass/course/_profile.scss
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
@include transition(none); @include transition(none);
div#location_sub, div#language_sub { div#location_sub,
div#language_sub {
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
...@@ -54,9 +55,6 @@ ...@@ -54,9 +55,6 @@
margin: lh(0.5) 0; margin: lh(0.5) 0;
width: 100%; width: 100%;
} }
&[type="input"]{
}
} }
&:empty { &:empty {
...@@ -80,7 +78,8 @@ ...@@ -80,7 +78,8 @@
text-transform: uppercase; text-transform: uppercase;
top: 9px; top: 9px;
&:hover, &:focus { &:hover,
&:focus {
color: #555; color: #555;
} }
} }
...@@ -111,7 +110,8 @@ ...@@ -111,7 +110,8 @@
text-transform: uppercase; text-transform: uppercase;
top: 9px; top: 9px;
&:hover, &:focus { &:hover,
&:focus {
color: #555; color: #555;
} }
} }
...@@ -171,7 +171,8 @@ ...@@ -171,7 +171,8 @@
padding: 5px 18px 6px; padding: 5px 18px 6px;
text-align: center; text-align: center;
&:hover, &:focus { &:hover,
&:focus {
text-decoration: none; text-decoration: none;
} }
} }
...@@ -182,7 +183,7 @@ ...@@ -182,7 +183,7 @@
width: 100%; width: 100%;
} }
> .credit-eligibility{ > .credit-eligibility {
border-top: 1px solid $lightGrey; border-top: 1px solid $lightGrey;
margin-top: lh(); margin-top: lh();
...@@ -205,7 +206,7 @@ ...@@ -205,7 +206,7 @@
@include padding-left(0.2em); @include padding-left(0.2em);
} }
> .detail-collapse{ > .detail-collapse {
border: none; border: none;
box-shadow: none; box-shadow: none;
background: $white; background: $white;
...@@ -216,7 +217,7 @@ ...@@ -216,7 +217,7 @@
padding: lh(0.25); padding: lh(0.25);
} }
> span{ > span {
color: inherit; color: inherit;
} }
} }
...@@ -224,7 +225,7 @@ ...@@ -224,7 +225,7 @@
> .requirement-container { > .requirement-container {
padding: lh(); padding: lh();
> .requirement{ > .requirement {
border-bottom: 1px solid $lightGrey; border-bottom: 1px solid $lightGrey;
padding: lh(0.5); padding: lh(0.5);
...@@ -233,26 +234,26 @@ ...@@ -233,26 +234,26 @@
display: inline-block; display: inline-block;
} }
> .requirement-status{ > .requirement-status {
width: bi-app-invert-percentage(60%); width: bi-app-invert-percentage(60%);
@include float(right); @include float(right);
display: inline-block; display: inline-block;
.fa-times{ .fa-times {
@extend %t-icon6; @extend %t-icon6;
color: $alert-color; color: $alert-color;
} }
.fa-check{ .fa-check {
@extend %t-icon6; @extend %t-icon6;
color: $success-color; color: $success-color;
} }
> .not-achieve{ > .not-achieve {
color: $darkGrey; color: $darkGrey;
} }
} }
...@@ -300,7 +301,7 @@ ...@@ -300,7 +301,7 @@
width: flex-grid(7, 9); width: flex-grid(7, 9);
> div { > div {
padding:0 0 lh() 0; padding: 0 0 lh() 0;
&:first-child { &:first-child {
padding-top: 0; padding-top: 0;
......
lms/static/sass/course/base/_base.scss
...@@ -104,7 +104,7 @@ input[type="password"] { ...@@ -104,7 +104,7 @@ input[type="password"] {
&:focus { &:focus {
border-color: lighten($link-color, 20%); border-color: lighten($link-color, 20%);
box-shadow: 0 0 6px 0 rgba($blue, 0.4), inset 0 0 4px 0 rgba(0,0,0, 0.15); box-shadow: 0 0 6px 0 rgba($blue, 0.4), inset 0 0 4px 0 rgba(0, 0,0, 0.15);
} }
} }
......
lms/static/sass/course/instructor/_email.scss
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
} }
} }
.email-background{ .email-background {
.content-history-email-table { .content-history-email-table {
display: none; display: none;
} }
......
lms/static/sass/course/layout/_courseware_header.scss
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
padding: 0; padding: 0;
width: 100%; width: 100%;
.course-material{ .course-material {
@extend %inner-wrapper; @extend %inner-wrapper;
} }
......
lms/static/sass/course/wiki/_wiki.scss
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
@include box-sizing(border-box); @include box-sizing(border-box);
.timestamp{ .timestamp {
margin-top: ($baseline*0.75); margin-top: ($baseline*0.75);
padding: 15px 0 0 10px; padding: 15px 0 0 10px;
border-top: 1px solid $light-gray; border-top: 1px solid $light-gray;
...@@ -597,7 +597,7 @@ ...@@ -597,7 +597,7 @@
margin-top: ($baseline*2); margin-top: ($baseline*2);
} }
#cheatsheet-body pre{ #cheatsheet-body pre {
color: $black; color: $black;
text-align: left; text-align: left;
background: #eee; background: #eee;
......
lms/static/sass/discussion/_discussion-v1.scss
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%pattern-library-btn { %pattern-library-btn {
@include transition( @include transition(
color 0.125s ease-in-out 0s, color 0.125s ease-in-out 0s,
border-color 0.125s ease-in-out 0s, border-color 0.125s ease-in-out 0s,
background 0.125s ease-in-out 0s, background 0.125s ease-in-out 0s,
box-shadow 0.125s ease-in-out 0s box-shadow 0.125s ease-in-out 0s
); );
......
lms/static/sass/discussion/_discussion.scss
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
border-radius: $forum-border-radius; border-radius: $forum-border-radius;
header { header {
.anonymous{ .anonymous {
font-size: $forum-base-font-size; font-size: $forum-base-font-size;
} }
} }
......
lms/static/sass/discussion/views/_home.scss
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
vertical-align: middle; vertical-align: middle;
} }
.profile-stat-label{ .profile-stat-label {
vertical-align: middle; vertical-align: middle;
} }
} }
......
lms/static/sass/discussion/views/_response.scss
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
} }
// CASE: label - community TA response // CASE: label - community TA response
&.community-ta{ &.community-ta {
padding-top: 38px; padding-top: 38px;
border-color: $forum-color-community-ta; border-color: $forum-color-community-ta;
} }
......
lms/static/sass/elements/_controls.scss
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
color: $action-primary-fg; color: $action-primary-fg;
} }
%btn-pl-white-base{ %btn-pl-white-base {
@extend %btn-pl-default-base; @extend %btn-pl-default-base;
background-color: $action-primary-fg; background-color: $action-primary-fg;
......
lms/static/sass/multicourse/_account.scss
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
// states - all // states - all
&.disabled, &.submitted { &.disabled, &.submitted {
color: rgba(0,0,0,.25); color: rgba(0, 0,0,.25);
label { label {
cursor: text; cursor: text;
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
textarea, input { textarea, input {
background: $container-bg; background: $container-bg;
color: rgba(0,0,0,.25); color: rgba(0, 0,0,.25);
} }
} }
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
// states - disabled // states - disabled
&.disabled { &.disabled {
label::after { label::after {
color: rgba(0,0,0,.35); color: rgba(0, 0,0,.35);
content: "(Disabled Currently)"; content: "(Disabled Currently)";
} }
} }
......
lms/static/sass/multicourse/_course_about.scss
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
background: $course-profile-bg; background: $course-profile-bg;
background-image: $homepage-bg-image; background-image: $homepage-bg-image;
background-size: cover; background-size: cover;
box-shadow: 0 1px 80px 0 rgba(0,0,0, 0.5); box-shadow: 0 1px 80px 0 rgba(0, 0,0, 0.5);
border-bottom: 1px solid $border-color-3; border-bottom: 1px solid $border-color-3;
box-shadow: inset 0 1px 5px 0 $shadow-l1; box-shadow: inset 0 1px 5px 0 $shadow-l1;
height: 280px; height: 280px;
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.intro-inner-wrapper { .intro-inner-wrapper {
background: $course-header-bg; background: $course-header-bg;
border: 1px solid $border-color-3; border: 1px solid $border-color-3;
box-shadow: 0 4px 25px 0 rgba(0,0,0, 0.5); box-shadow: 0 4px 25px 0 rgba(0, 0,0, 0.5);
@include box-sizing(border-box); @include box-sizing(border-box);
@include clearfix(); @include clearfix();
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
position: relative; position: relative;
.play-intro { .play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75))); @include background-image(linear-gradient(-90deg, rgba(0, 0,0, 0.65), rgba(0, 0,0, 0.75)));
border-radius: 4px; border-radius: 4px;
box-shadow: 0 1px 12px 0 $shadow-d1; box-shadow: 0 1px 12px 0 $shadow-d1;
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
margin-top: -16px; margin-top: -16px;
position: absolute; position: absolute;
text-shadow: 0 -1px rgba(0,0,0, 0.8); text-shadow: 0 -1px rgba(0, 0,0, 0.8);
top: 50%; top: 50%;
} }
} }
...@@ -250,9 +250,9 @@ ...@@ -250,9 +250,9 @@
text-decoration: none; text-decoration: none;
.play-intro { .play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.75), rgba(0,0,0, 0.8))); @include background-image(linear-gradient(-90deg, rgba(0, 0,0, 0.75), rgba(0, 0,0, 0.8)));
box-shadow: 0 1px 12px 0 rgba(0,0,0, 0.5); box-shadow: 0 1px 12px 0 rgba(0, 0,0, 0.5);
border-color: rgba(255,255,255, 0.9); border-color: rgba(255,255,255, 0.9);
&::after { &::after {
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
width: flex-grid(4); width: flex-grid(4);
> section { > section {
box-shadow: inset 0 0 3px 0 rgba(0,0,0, 0.15); box-shadow: inset 0 0 3px 0 rgba(0, 0,0, 0.15);
border: 1px solid $border-color-2; border: 1px solid $border-color-2;
&.course-summary { &.course-summary {
...@@ -485,12 +485,12 @@ ...@@ -485,12 +485,12 @@
} }
.sharing-message { .sharing-message {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%, @include background-image(linear-gradient(-90deg, rgba(0, 0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%)); rgba(0, 0,0, 0.7) 100%));
border: 1px solid rgba(0,0,0, 0.5); border: 1px solid rgba(0, 0,0, 0.5);
border-radius: 4px; border-radius: 4px;
box-shadow: 0 4px 25px 0 rgba(0,0,0, 0.5); box-shadow: 0 4px 25px 0 rgba(0, 0,0, 0.5);
@include box-sizing(border-box); @include box-sizing(border-box);
......
lms/static/sass/multicourse/_courses.scss
...@@ -138,7 +138,7 @@ $facet-background-color: #007db8; ...@@ -138,7 +138,7 @@ $facet-background-color: #007db8;
background-image: $homepage-bg-image; background-image: $homepage-bg-image;
background-position: center top !important; background-position: center top !important;
border-bottom: 1px solid $border-color-3; border-bottom: 1px solid $border-color-3;
box-shadow: inset 0 -1px 8px 0 rgba(0,0,0, 0.2), inset 0 1px 12px 0 rgba(0,0,0, 0.3); box-shadow: inset 0 -1px 8px 0 rgba(0, 0,0, 0.2), inset 0 1px 12px 0 rgba(0, 0,0, 0.3);
height: 430px; height: 430px;
margin-top: $header_image_margin; margin-top: $header_image_margin;
width: 100%; width: 100%;
...@@ -156,7 +156,7 @@ $facet-background-color: #007db8; ...@@ -156,7 +156,7 @@ $facet-background-color: #007db8;
background: $white; background: $white;
background: $course-header-bg; background: $course-header-bg;
border: 1px solid $border-color-3; border: 1px solid $border-color-3;
box-shadow: 0 4px 25px 0 rgba(0,0,0, 0.5); box-shadow: 0 4px 25px 0 rgba(0, 0,0, 0.5);
padding: $baseline ($baseline*1.5); padding: $baseline ($baseline*1.5);
position: relative; position: relative;
z-index: 2; z-index: 2;
......
lms/static/sass/multicourse/_dashboard.scss
...@@ -781,7 +781,7 @@ ...@@ -781,7 +781,7 @@
width: flex-grid(9, 12); width: flex-grid(9, 12);
display: inline-block; display: inline-block;
.message-copy-bold{ .message-copy-bold {
font-weight: 600; font-weight: 600;
} }
} }
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
@include left($baseline/2); @include left($baseline/2);
@include padding(($baseline * 0.4), 0, ($baseline * 0.4), ($baseline * 0.75)); @include padding(($baseline * 0.4), 0, ($baseline * 0.4), ($baseline * 0.75));
.action-upgrade-icon{ .action-upgrade-icon {
@include float(left); @include float(left);
display: inline; display: inline;
...@@ -1403,7 +1403,7 @@ ...@@ -1403,7 +1403,7 @@
} }
} }
p.course-block{ p.course-block {
border-style: solid; border-style: solid;
border-color: #e3dc86; border-color: #e3dc86;
padding: ($baseline/4); padding: ($baseline/4);
...@@ -1412,7 +1412,7 @@ p.course-block{ ...@@ -1412,7 +1412,7 @@ p.course-block{
} }
.enter-course-blocked{ .enter-course-blocked {
@include box-sizing(border-box); @include box-sizing(border-box);
@include float(left); @include float(left);
...@@ -1440,7 +1440,7 @@ p.course-block{ ...@@ -1440,7 +1440,7 @@ p.course-block{
} }
} }
a.disable-look{ a.disable-look {
color: #808080; color: #808080;
} }
...@@ -1558,7 +1558,7 @@ a.fade-cover { ...@@ -1558,7 +1558,7 @@ a.fade-cover {
border: $palette-info-border 1px solid; border: $palette-info-border 1px solid;
padding: 5px; padding: 5px;
.message-title{ .message-title {
margin-bottom: 0; margin-bottom: 0;
} }
......
lms/static/sass/multicourse/_home.scss
...@@ -170,7 +170,7 @@ $course-search-input-height: ($button-size); ...@@ -170,7 +170,7 @@ $course-search-input-height: ($button-size);
@include border-left(0); @include border-left(0);
@include box-sizing(border-box); @include box-sizing(border-box);
// box-shadow: 0 4px 25px 0 rgba(0,0,0, 0.5); // box-shadow: 0 4px 25px 0 rgba(0, 0,0, 0.5);
height: 120px; height: 120px;
@include float(left); @include float(left);
...@@ -193,7 +193,7 @@ $course-search-input-height: ($button-size); ...@@ -193,7 +193,7 @@ $course-search-input-height: ($button-size);
background-size: cover; background-size: cover;
.play-intro { .play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75))); @include background-image(linear-gradient(-90deg, rgba(0, 0,0, 0.65), rgba(0, 0,0, 0.75)));
border-radius: 4px; border-radius: 4px;
box-shadow: 0 1px 12px 0 $shadow-d1; box-shadow: 0 1px 12px 0 $shadow-d1;
...@@ -228,7 +228,7 @@ $course-search-input-height: ($button-size); ...@@ -228,7 +228,7 @@ $course-search-input-height: ($button-size);
margin-top: -16px; margin-top: -16px;
position: absolute; position: absolute;
text-shadow: 0 -1px rgba(0,0,0, 0.8); text-shadow: 0 -1px rgba(0, 0,0, 0.8);
top: 50%; top: 50%;
} }
} }
...@@ -241,9 +241,9 @@ $course-search-input-height: ($button-size); ...@@ -241,9 +241,9 @@ $course-search-input-height: ($button-size);
&:hover, &:focus { &:hover, &:focus {
.play-intro { .play-intro {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.75), rgba(0,0,0, 0.8))); @include background-image(linear-gradient(-90deg, rgba(0, 0,0, 0.75), rgba(0, 0,0, 0.8)));
box-shadow: 0 1px 12px 0 rgba(0,0,0, 0.5); box-shadow: 0 1px 12px 0 rgba(0, 0,0, 0.5);
border-color: rgba(255,255,255, 0.9); border-color: rgba(255,255,255, 0.9);
&::after { &::after {
...@@ -546,7 +546,7 @@ $course-search-input-height: ($button-size); ...@@ -546,7 +546,7 @@ $course-search-input-height: ($button-size);
.news { .news {
@include box-sizing(border-box); @include box-sizing(border-box);
box-shadow: inset 0 0 3px 0 rgba(0,0,0, 0.15); box-shadow: inset 0 0 3px 0 rgba(0, 0,0, 0.15);
padding: 20px; padding: 20px;
width: flex-grid(12); width: flex-grid(12);
......
lms/static/sass/multicourse/_survey-page.scss
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
@include float(left); @include float(left);
@include margin-right(flex-gutter()); @include margin-right(flex-gutter());
width: flex-grid(9,12); width: flex-grid(9, 12);
} }
.content-supplementary { .content-supplementary {
@include float(left); @include float(left);
width: flex-grid(3,12); width: flex-grid(3, 12);
margin-top: ($baseline*2); margin-top: ($baseline*2);
} }
......
lms/static/sass/shared-v2/_header.scss
...@@ -99,14 +99,14 @@ ...@@ -99,14 +99,14 @@
} }
} }
.tab-nav-item{ .tab-nav-item {
@include float(left); @include float(left);
display: flex; display: flex;
margin: 0; margin: 0;
justify-content: center; justify-content: center;
.tab-nav-link{ .tab-nav-link {
font-size: font-size(base); font-size: font-size(base);
font-weight: font-weight(semi-bold); font-weight: font-weight(semi-bold);
color: palette(grayscale, dark); color: palette(grayscale, dark);
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
} }
} }
.active{ .active {
border-bottom: 4px solid $black-t3 !important; border-bottom: 4px solid $black-t3 !important;
} }
} }
......
lms/static/sass/shared-v2/_modal.scss
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
&::before { &::before {
@include background-image( @include background-image(
radial-gradient( radial-gradient(
50% 50%, circle closest-side, 50% 50%, circle closest-side,
$white-opacity-80 0%, $white-opacity-80 0%,
$white-transparent 100% $white-transparent 100%
) )
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
hr { hr {
@include background-image( @include background-image(
linear-gradient( linear-gradient(
180deg, 180deg,
$white-transparent 0%, $white-transparent 0%,
$white-opacity-80 50%, $white-opacity-80 50%,
$white-transparent $white-transparent
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
&::after { &::after {
@include background-image( @include background-image(
linear-gradient( linear-gradient(
180deg, 180deg,
$light-grey-transparent 0%, $light-grey-transparent 0%,
$light-grey-solid 50%, $light-grey-solid 50%,
$light-grey-transparent $light-grey-transparent
......
lms/static/sass/shared-v2/_variables.scss
...@@ -41,7 +41,7 @@ $white-opacity-60: rgba(255, 255, 255, 0.6) !default; ...@@ -41,7 +41,7 @@ $white-opacity-60: rgba(255, 255, 255, 0.6) !default;
$white-opacity-70: rgba(255, 255, 255, 0.7) !default; $white-opacity-70: rgba(255, 255, 255, 0.7) !default;
$white-opacity-80: rgba(255, 255, 255, 0.8) !default; $white-opacity-80: rgba(255, 255, 255, 0.8) !default;
$black: rgb(0,0,0) !default; $black: rgb(0, 0,0) !default;
$black-t0: rgba($black, 0.125) !default; $black-t0: rgba($black, 0.125) !default;
$black-t1: rgba($black, 0.25) !default; $black-t1: rgba($black, 0.25) !default;
$black-t2: rgba($black, 0.5) !default; $black-t2: rgba($black, 0.5) !default;
...@@ -71,7 +71,7 @@ $lms-dark-icon-background-color: palette(grayscale, black) !default; ...@@ -71,7 +71,7 @@ $lms-dark-icon-background-color: palette(grayscale, black) !default;
$site-status-color: rgb(182,37,103) !default; $site-status-color: rgb(182,37,103) !default;
$shadow-l1: rgba(0,0,0,0.1) !default; $shadow-l1: rgba(0, 0,0, 0.1) !default;
$error-color: rgb(203, 7, 18) !default; $error-color: rgb(203, 7, 18) !default;
$warning-color: rgb(255, 192, 31) !default; $warning-color: rgb(255, 192, 31) !default;
......
lms/static/sass/shared/_course_filter.scss
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
z-index: 9; z-index: 9;
&.fixed-top { &.fixed-top {
box-shadow: 0 1px 15px 0 rgba(0,0,0, 0.2), inset 0 0 0 1px rgba(255,255,255, 0.4); box-shadow: 0 1px 15px 0 rgba(0, 0,0, 0.2), inset 0 0 0 1px rgba(255,255,255, 0.4);
max-width: 1200px; max-width: 1200px;
position: fixed; position: fixed;
top: 0; top: 0;
......
lms/static/sass/shared/_course_object.scss
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
@include box-sizing(border-box); @include box-sizing(border-box);
box-shadow: 0 1px 10px 0 rgba(0,0,0, 0.15), inset 0 0 0 1px rgba(255,255,255, 0.9); box-shadow: 0 1px 10px 0 rgba(0, 0,0, 0.15), inset 0 0 0 1px rgba(255,255,255, 0.9);
margin-bottom: ($baseline*1.5); margin-bottom: ($baseline*1.5);
position: relative; position: relative;
width: 100%; width: 100%;
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
.meta-info { .meta-info {
background: $dark-trans-bg; background: $dark-trans-bg;
bottom: 6px; bottom: 6px;
border: 1px solid rgba(0,0,0, 0.5); border: 1px solid rgba(0, 0,0, 0.5);
@include border-right-radius(2px); @include border-right-radius(2px);
box-shadow: 0 1px 5px 0 rgba(0,0,0, 0.15); box-shadow: 0 1px 5px 0 rgba(0, 0,0, 0.15);
@include clearfix(); @include clearfix();
......
lms/static/sass/shared/_forms.scss
...@@ -48,7 +48,7 @@ input[type="tel"] { ...@@ -48,7 +48,7 @@ input[type="tel"] {
&:focus { &:focus {
border-color: darken($button-archive-color, 50%); border-color: darken($button-archive-color, 50%);
box-shadow: 0 0 6px 0 darken($button-archive-color, 50%), inset 0 0 4px 0 rgba(0,0,0, 0.15); box-shadow: 0 0 6px 0 darken($button-archive-color, 50%), inset 0 0 4px 0 rgba(0, 0,0, 0.15);
} }
} }
......
lms/static/sass/shared/_header.scss
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
.user-dropdown-menu, .dropdown-menu { .user-dropdown-menu, .dropdown-menu {
background: $white; background: $white;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 2px 2px 0 rgba(0,0,0, 0.3); box-shadow: 0 2px 2px 0 rgba(0, 0,0, 0.3);
border: 1px solid $gray-l3; border: 1px solid $gray-l3;
display: none; display: none;
margin-top: 0; margin-top: 0;
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
@include float(left); @include float(left);
.tab-nav-item{ .tab-nav-item {
display: flex; display: flex;
margin: 0; margin: 0;
text-transform: none; text-transform: none;
...@@ -304,19 +304,19 @@ ...@@ -304,19 +304,19 @@
justify-content: center; justify-content: center;
.tab-nav-link{ .tab-nav-link {
font-size: em(16); font-size: em(16);
color: $gray; color: $gray;
padding: 5px 25px 23px; padding: 5px 25px 23px;
display: inline-block; display: inline-block;
&:hover, &:hover,
&:focus{ &:focus {
border-bottom: 4px solid $courseware-border-bottom-color; border-bottom: 4px solid $courseware-border-bottom-color;
} }
} }
.active{ .active {
border-bottom: 4px solid $black-t3 !important; border-bottom: 4px solid $black-t3 !important;
} }
} }
...@@ -437,7 +437,7 @@ ...@@ -437,7 +437,7 @@
.nav-global { .nav-global {
@include float(left); @include float(left);
.tab-nav-item{ .tab-nav-item {
display: flex; display: flex;
margin: 0; margin: 0;
text-transform: none; text-transform: none;
...@@ -446,19 +446,19 @@ ...@@ -446,19 +446,19 @@
justify-content: center; justify-content: center;
.tab-nav-link{ .tab-nav-link {
font-size: em(16); font-size: em(16);
color: $gray; color: $gray;
display: inline-block; display: inline-block;
padding: 5px 25px 19px; padding: 5px 25px 19px;
&:hover, &:hover,
&:focus{ &:focus {
border-bottom: 4px solid $courseware-border-bottom-color; border-bottom: 4px solid $courseware-border-bottom-color;
} }
} }
.active{ .active {
border-bottom: 4px solid $black-t3 !important; border-bottom: 4px solid $black-t3 !important;
} }
} }
...@@ -624,7 +624,7 @@ ...@@ -624,7 +624,7 @@
.user-dropdown-menu, .dropdown-menu { .user-dropdown-menu, .dropdown-menu {
background: $border-color-4; background: $border-color-4;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 2px 24px 0 rgba(0,0,0, 0.3); box-shadow: 0 2px 24px 0 rgba(0, 0,0, 0.3);
border: 1px solid $border-color-3; border: 1px solid $border-color-3;
display: none; display: none;
margin-top: 0; margin-top: 0;
......
lms/static/sass/views/_account-settings.scss
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
border-bottom: 4px solid $courseware-border-bottom-color !important; border-bottom: 4px solid $courseware-border-bottom-color !important;
} }
&.active{ &.active {
border-bottom: 4px solid $black-t3 !important; border-bottom: 4px solid $black-t3 !important;
} }
} }
...@@ -138,11 +138,11 @@ ...@@ -138,11 +138,11 @@
position: relative; position: relative;
z-index: 10; z-index: 10;
&::-ms-expand{ &::-ms-expand {
display: none; display: none;
} }
~ .icon-caret-down{ ~ .icon-caret-down {
&::after { &::after {
content: ""; content: "";
border-left: 6px solid transparent; border-left: 6px solid transparent;
......
lms/static/sass/views/_shoppingcart.scss
...@@ -936,7 +936,7 @@ $light-border: 1px solid $gray-l5; ...@@ -936,7 +936,7 @@ $light-border: 1px solid $gray-l5;
} }
} }
.error-text{ .error-text {
@extend %t-copy-sub2; @extend %t-copy-sub2;
display: block; display: block;
......
lms/static/sass/views/_teams.scss
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
.page-header.has-secondary { .page-header.has-secondary {
.page-header-main { .page-header-main {
display: inline-block; display: inline-block;
width: flex-grid(8,12); width: flex-grid(8, 12);
} }
.page-header-secondary { .page-header-secondary {
......
lms/static/sass/views/_verification.scss
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
.wrapper-sts { .wrapper-sts {
display: inline-block; display: inline-block;
width: flex-grid(9,12); width: flex-grid(9, 12);
margin-bottom: ($baseline/4); margin-bottom: ($baseline/4);
} }
...@@ -1226,6 +1226,7 @@ ...@@ -1226,6 +1226,7 @@
.copy { .copy {
@extend %t-copy-lead1; @extend %t-copy-lead1;
@extend %t-weight4; @extend %t-weight4;
@include left(calc(50% - 46px)); @include left(calc(50% - 46px));
position: absolute; position: absolute;
......
scripts/all-tests.sh
...@@ -13,7 +13,7 @@ set -e ...@@ -13,7 +13,7 @@ set -e
# Violations thresholds for failing the build # Violations thresholds for failing the build
export PYLINT_THRESHOLD=3600 export PYLINT_THRESHOLD=3600
export ESLINT_THRESHOLD=9134 export ESLINT_THRESHOLD=9134
export STYLELINT_THRESHOLD=5155 export STYLELINT_THRESHOLD=1942
XSSLINT_THRESHOLDS=`cat scripts/xsslint_thresholds.json` XSSLINT_THRESHOLDS=`cat scripts/xsslint_thresholds.json`
export XSSLINT_THRESHOLDS=${XSSLINT_THRESHOLDS//[[:space:]]/} export XSSLINT_THRESHOLDS=${XSSLINT_THRESHOLDS//[[:space:]]/}
......
themes/edge.edx.org/lms/static/sass/partials/base/_certificates.scss
// Certificate overrides for edge.edx.org // Certificate overrides for edge.edx.org
.certificate-card { .certificate-card {
// Note: edx.org no longer supports audit certificates, but there are // Note: edx.org no longer supports audit certificates, but there are
// legacy certificates that might be rendered. In this situation, they // legacy certificates that might be rendered. In this situation, they
// are styled as honor certificates. // are styled as honor certificates.
&.mode-honor, &.mode-audit { &.mode-honor, &.mode-audit {
border-color: $honor-mode-color; border-color: $honor-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/honor.png'); background-image: url('#{$static-path}/images/certificates/honor.png');
}
} }
}
&.mode-verified { &.mode-verified {
border-color: $verified-mode-color; border-color: $verified-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/verified.png'); background-image: url('#{$static-path}/images/certificates/verified.png');
}
} }
}
&.mode-professional { &.mode-professional {
border-color: $professional-certificate-color; border-color: $professional-certificate-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/professional.png'); background-image: url('#{$static-path}/images/certificates/professional.png');
}
} }
}
} }
themes/edx.org/lms/static/sass/partials/base/_certificates.scss
// Certificate overrides for edx.org // Certificate overrides for edx.org
.certificate-card { .certificate-card {
// Note: edx.org no longer supports audit certificates, but there are // Note: edx.org no longer supports audit certificates, but there are
// legacy certificates that might be rendered. In this situation, they // legacy certificates that might be rendered. In this situation, they
// are styled as honor certificates. // are styled as honor certificates.
&.mode-honor, &.mode-audit { &.mode-honor, &.mode-audit {
border-color: $honor-mode-color; border-color: $honor-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/honor.png'); background-image: url('#{$static-path}/images/certificates/honor.png');
}
} }
}
&.mode-verified { &.mode-verified {
border-color: $verified-mode-color; border-color: $verified-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/verified.png'); background-image: url('#{$static-path}/images/certificates/verified.png');
}
} }
}
&.mode-professional { &.mode-professional {
border-color: $professional-certificate-color; border-color: $professional-certificate-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/professional.png'); background-image: url('#{$static-path}/images/certificates/professional.png');
}
} }
}
} }
themes/red-theme/lms/static/sass/partials/base/_certificates.scss
// Certificate overrides for the red theme // Certificate overrides for the red theme
.certificate-card { .certificate-card {
&.mode-audit { &.mode-audit {
border-color: $audit-mode-color; border-color: $audit-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/red-certificate.png'); background-image: url('#{$static-path}/images/certificates/red-certificate.png');
}
} }
}
&.mode-honor { &.mode-honor {
border-color: $honor-mode-color; border-color: $honor-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/red-certificate.png'); background-image: url('#{$static-path}/images/certificates/red-certificate.png');
}
} }
}
&.mode-verified { &.mode-verified {
border-color: $verified-mode-color; border-color: $verified-mode-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/red-certificate.png'); background-image: url('#{$static-path}/images/certificates/red-certificate.png');
}
} }
}
&.mode-professional { &.mode-professional {
border-color: $professional-certificate-color; border-color: $professional-certificate-color;
.card-logo { .card-logo {
background-image: url('#{$static-path}/images/certificates/red-certificate.png'); background-image: url('#{$static-path}/images/certificates/red-certificate.png');
}
} }
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment