More Sass quality fixes

This commit is contained in:
Andy Armstrong
2017-10-11 17:18:58 -04:00
parent 6387e3a813
commit bd1a0d96cf
78 changed files with 1869 additions and 1641 deletions

View File

@@ -22,16 +22,18 @@ $annotatable--body-font-size: em(14);
border-radius: 0.5em;
margin-bottom: 0.5em;
&.shaded { background-color: #EDEDED; }
&.shaded { background-color: #ededed; }
.annotatable-section-title {
font-weight: bold;
a { font-weight: normal; }
}
.annotatable-section-body {
border-top: 1px solid $annotatable--border-color;
margin-top: 0.5em;
padding-top: 0.5em;
@include clearfix();
}
@@ -40,6 +42,7 @@ $annotatable--body-font-size: em(14);
margin-left: 4em;
b { font-weight: bold; }
i { font-style: italic; }
code {
display: inline;
white-space: pre;
@@ -58,9 +61,11 @@ $annotatable--body-font-size: em(14);
.annotatable-span {
@extend %ui-fake-link;
display: inline;
$highlight_index: 0;
@each $highlight in (
(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)),
@@ -80,6 +85,7 @@ $annotatable--body-font-size: em(14);
&.selected { background-color: $selected_color; }
}
}
&.highlight-#{$marker} {
background-color: $color;
&.selected { background-color: $selected_color; }
@@ -89,6 +95,7 @@ $annotatable--body-font-size: em(14);
&.hide {
cursor: none;
background-color: inherit;
.annotatable-icon {
display: none;
}
@@ -113,20 +120,24 @@ $annotatable--body-font-size: em(14);
background-color: transparent;
padding: ($baseline/4) ($baseline/2);
border: none;
.ui-tooltip-title {
padding: ($baseline/4) 0;
border-bottom: 2px solid #333;
font-weight: bold;
}
.ui-tooltip-icon {
right: 10px;
background: #333;
}
.ui-state-hover {
color: inherit;
border: 1px solid $gray-l3;
}
}
.ui-tooltip-content {
color: inherit;
font-size: em(14);
@@ -136,16 +147,19 @@ $annotatable--body-font-size: em(14);
background-color: transparent;
border-color: transparent;
}
p {
color: inherit;
line-height: normal;
color: inherit;
line-height: normal;
}
}
.ui-tooltip.qtip.ui-tooltip-annotatable {
max-width: 375px;
.ui-tooltip-content {
padding: 0 ($baseline/2);
.annotatable-comment {
display: block;
margin: 0 0 ($baseline/2) 0;
@@ -153,6 +167,7 @@ $annotatable--body-font-size: em(14);
overflow: auto;
line-height: normal;
}
.annotatable-reply {
display: block;
border-top: 2px solid #333;
@@ -161,6 +176,7 @@ $annotatable--body-font-size: em(14);
text-align: center;
}
}
&:after {
content: '';
display: inline-block;

View File

@@ -46,10 +46,10 @@ $asterisk-icon: '\f069'; // .fa-asterisk
// +Mixins - Status Icon - Capa
// ====================
@mixin status-icon($color: $gray, $fontAwesomeIcon: "\f00d"){
.status-icon {
&:after {
@extend %use-font-awesome;
color: $color;
font-size: 1.2em;
content: $fontAwesomeIcon;
@@ -65,6 +65,7 @@ h2 {
&.problem-header {
display: inline-block;
section.staff {
margin-top: ($baseline*1.5);
font-size: 80%;
@@ -92,6 +93,7 @@ h2 {
.feedback-hint-incorrect {
@extend %feedback-hint;
.icon {
color: $incorrect;
}
@@ -100,6 +102,7 @@ h2 {
.feedback-hint-partially-correct,
.feedback-hint-correct {
@extend %feedback-hint;
.icon {
color: $correct;
}
@@ -200,12 +203,14 @@ div.problem {
// Choice Group - silent class
%choicegroup-base {
@include clearfix();
min-width: 100px;
width: auto !important;
width: 100px;
label {
@include box-sizing(border-box);
display: inline-block;
clear: both;
margin-bottom: ($baseline/2);
@@ -224,6 +229,7 @@ div.problem {
&.choicegroup_correct {
@include status-icon($correct, $checkmark-icon);
border: 2px solid $correct;
// keep green for correct answers on hover.
@@ -234,6 +240,7 @@ div.problem {
&.choicegroup_partially-correct {
@include status-icon($partially-correct, $asterisk-icon);
border: 2px solid $partially-correct;
// keep green for correct answers on hover.
@@ -244,6 +251,7 @@ div.problem {
&.choicegroup_incorrect {
@include status-icon($incorrect, $cross-icon);
border: 2px solid $incorrect;
// keep red for incorrect answers on hover.
@@ -283,9 +291,11 @@ div.problem {
div.problem {
.choicegroup {
@extend %choicegroup-base;
label {
@include padding($baseline/2);
@include padding-left($baseline*1.9);
position: relative;
font-size: $base-font-size;
line-height: normal;
@@ -295,6 +305,7 @@ div.problem {
input[type="radio"],
input[type="checkbox"] {
@include left(em(9));
position: absolute;
top: em(9);
}
@@ -317,9 +328,8 @@ div.problem {
// ====================
// Summary status indicators shown after the input area
div.problem {
.indicator-container {
@include margin-left($baseline*.75);
@include margin-left($baseline*.75);
.status {
width: $baseline;
@@ -398,6 +408,7 @@ div.problem {
span.clarification i {
font-style: normal;
&:hover {
color: $blue;
}
@@ -447,10 +458,12 @@ div.problem {
&:before {
@extend %t-strong;
display: inline;
content: "Answer: ";
}
&:empty {
&:before {
display: none;
@@ -468,6 +481,7 @@ div.problem {
img.loading {
@include padding-left($baseline/2);
display: inline-block;
}
@@ -533,12 +547,14 @@ div.problem {
.reload {
@include float(right);
margin: ($baseline/2);
}
.grader-status {
@include clearfix();
margin: $baseline/2 0;
padding: $baseline/2;
border-radius: 5px;
@@ -583,6 +599,7 @@ div.problem {
}
}
.evaluation {
p {
margin-bottom: ($baseline/5);
@@ -598,6 +615,7 @@ div.problem {
.evaluation-response {
header {
text-align: right;
a {
font-size: .85em;
}
@@ -686,7 +704,6 @@ div.problem {
table-layout: auto;
td, th {
&.cont-justified-left {
text-align: left !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
}
@@ -702,6 +719,7 @@ div.problem {
th {
@extend %t-strong;
text-align: left;
}
@@ -760,9 +778,9 @@ div.problem {
// ====================
.problem {
.capa_inputtype.textline, .inputtype.formulaequationinput {
input {
@include box-sizing(border-box);
border: 2px solid $gray-l4;
border-radius: 3px;
min-width: 160px;
@@ -777,7 +795,6 @@ div.problem {
// CASE: incorrect answer
> .incorrect {
input {
border: 2px solid $incorrect;
}
@@ -789,7 +806,6 @@ div.problem {
// CASE: partially correct answer
> .partially-correct {
input {
border: 2px solid $partially-correct;
}
@@ -801,7 +817,6 @@ div.problem {
// CASE: correct answer
> .correct {
input {
border: 2px solid $correct;
}
@@ -813,7 +828,6 @@ div.problem {
// CASE: submitted, correctness withheld
> .submitted {
input {
border: 2px solid $submitted;
}
@@ -825,7 +839,6 @@ div.problem {
// CASE: unanswered and unsubmitted
> .unanswered, > .unsubmitted {
input {
border: 2px solid $gray-l4;
}
@@ -843,6 +856,7 @@ div.problem {
.trailing_text {
@include margin-right($baseline/2);
display: inline-block;
}
}
@@ -871,7 +885,6 @@ div.problem {
// +Problem - CodeMirror
// ====================
div.problem {
.CodeMirror {
border: 1px solid black;
font-size: 14px;
@@ -879,9 +892,9 @@ div.problem {
resize: none;
.cm-tab {
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
background-position: right;
background-repeat: no-repeat;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
background-position: right;
background-repeat: no-repeat;
}
pre {
@@ -899,6 +912,7 @@ div.problem {
&.CodeMirror-cursor {
@extend %ui-depth1;
position: absolute;
visibility: hidden;
width: 0;
@@ -944,6 +958,7 @@ div.problem .action {
.problem-action-button-wrapper {
@include border-right(1px solid $light-gray1);
display: inline-block;
&:last-child {
@@ -953,6 +968,7 @@ div.problem .action {
.problem-action-btn {
@include margin-right($baseline / 5);
max-width: 110px;
.icon {
@@ -974,15 +990,18 @@ div.problem .action {
max-width: 100%;
padding-bottom: $baseline;
}
.submit {
@include margin-right($baseline / 2);
@include float(left);
white-space: nowrap;
}
}
.submission-feedback {
@include margin-right($baseline / 2);
margin-top: $baseline / 2;
display: inline-block;
color: $gray-d1;
@@ -1034,6 +1053,7 @@ div.problem {
&:first-child {
@extend %t-strong;
margin-bottom: 0;
}
@@ -1043,12 +1063,12 @@ div.problem {
.detailed-targeted-feedback-partially-correct,
.detailed-targeted-feedback-correct {
> p {
margin: 0;
font-weight: normal;
margin: 0;
font-weight: normal;
&:first-child {
@extend %t-strong;
}
&:first-child {
@extend %t-strong;
}
}
}
@@ -1063,6 +1083,7 @@ div.problem {
.notification {
@include float(left);
margin-top: $baseline / 2;
padding: ($baseline / 2.5) ($baseline / 2) ($baseline / 5) ($baseline / 2);
line-height: $base-line-height;
@@ -1089,6 +1110,7 @@ div.problem {
.icon {
@include margin-right(3 * $baseline / 4);
color: $uxpl-gray-dark;
}
@@ -1103,6 +1125,7 @@ div.problem {
.icon {
@include float(left);
position: relative;
top: $baseline / 5;
}
@@ -1133,6 +1156,7 @@ div.problem {
.notification-btn {
@include float(right);
padding: ($baseline / 10) ($baseline / 4);
min-width: ($baseline * 3);
display: block;
@@ -1183,7 +1207,7 @@ div.problem {
}
.capa_reset>h2 {
color: #aa0000;
color: #a00;
}
.capa_reset li {
@@ -1195,6 +1219,7 @@ div.problem {
h3 {
@extend %t-strong;
padding: 9px;
border-bottom: 1px solid #e3e3e3;
background: #eee;
@@ -1236,6 +1261,7 @@ div.problem {
h3 {
@extend %t-strong;
color: #aaa;
text-transform: uppercase;
font-style: normal;
@@ -1263,6 +1289,7 @@ div.problem {
a.full {
@include position(absolute, 0 0 1px 0);
@include box-sizing(border-box);
display: block;
padding: ($baseline/5);
background: $gray-l4;
@@ -1355,7 +1382,7 @@ div.problem {
background: url('#{$static-path}/images/incorrect-icon.png') left 20px no-repeat;
.result-actual-output {
color: #B00;
color: #b00;
}
}
@@ -1366,7 +1393,7 @@ div.problem {
border-left: 20px solid #fafafa;
bs {
color: #bb0000;
color: #b00;
}
bg {
@@ -1446,6 +1473,7 @@ div.problem {
.annotation-header {
@extend %t-strong;
padding: .5em 1em;
border-bottom: 1px solid $gray-l3;
}
@@ -1487,6 +1515,7 @@ div.problem {
.tag {
@extend %ui-fake-link;
display: inline-block;
margin-left: ($baseline*2);
border: 1px solid rgb(102,102,102);
@@ -1495,6 +1524,7 @@ div.problem {
background-color: $annotation-yellow;
}
}
.tag-status {
position: absolute;
left: 0;
@@ -1507,6 +1537,7 @@ div.problem {
$num-lines-to-show: 5;
$line-height: 1.4em;
$padding: .2em;
padding: $padding (2 * $padding);
width: 100%;
height: ($num-lines-to-show * $line-height) + (2*$padding) - (($line-height - 1)/2);
@@ -1529,6 +1560,7 @@ div.problem {
&:before {
@extend %t-strong;
display: block;
content: "debug input value";
text-transform: uppercase;
@@ -1575,6 +1607,7 @@ div.problem {
label.choicetextgroup_show_correct, section.choicetextgroup_show_correct {
&:after {
@include margin-left($baseline*.75);
content: url('#{$static-path}/images/correct-icon.png');
}
}
@@ -1590,7 +1623,6 @@ div.problem {
// NOTE: temporary override until image inputs use same base html structure as other common capa input types.
div.problem .imageinput.capa_inputtype {
.status {
display: inline-block;
position: relative;
@@ -1621,7 +1653,6 @@ div.problem .imageinput.capa_inputtype {
// NOTE: temporary override until annotation problem inputs use same base html structure as other common capa input types.
div.problem .annotation-input {
.tag-status {
display: inline-block;
position: relative;

View File

@@ -2,4 +2,4 @@
background: #fff;
font-size: 13px;
color: #3c3c3c;
}
}

View File

@@ -9,13 +9,16 @@
.editor-bar {
@include clearfix();
@include linear-gradient(top, #d4dee8, #c9d5e2);
position: relative;
padding: ($baseline/4);
border-bottom-color: #a5aaaf;
button {
display: inline-block;
@include float(left);
padding: 3px ($baseline/2) 5px;
margin-left: 7px;
border: 0;
@@ -23,7 +26,7 @@
background: transparent;
.icon {
height: 21px;
height: 21px;
}
&:hover,
@@ -36,6 +39,7 @@
.editor-tabs {
position: absolute;
top: 10px;
@include right(10px);
@include text-align(left);
@include direction();
@@ -55,7 +59,9 @@
padding: 7px 20px 3px;
border: 1px solid #a5aaaf;
border-radius: 3px 3px 0 0;
@include linear-gradient(top, $transparent 87%, rgba(0, 0, 0, .06));
background-color: #e5ecf3;
font-size: 13px;
color: #3c3c3c;

View File

@@ -4,11 +4,12 @@
}
h1 {
color: $baseFontColor;
font: normal 2em/1.4em $sans-serif;
letter-spacing: 1px;
@include margin(0, 0, 1.416em, 0);
}
color: $baseFontColor;
font: normal 2em/1.4em $sans-serif;
letter-spacing: 1px;
@include margin(0, 0, 1.416em, 0);
}
h2 {
color: #646464;
@@ -20,6 +21,7 @@ h2 {
h3, h4, h5, h6 {
@include margin(0, 0, ($baseline/2), 0);
font-weight: 600;
}
@@ -73,6 +75,7 @@ blockquote {
ol, ul {
// Using the lower level Bi App Sass mixin to avoid @padding conflicts with bourbon.
@include bi-app-compact(padding, 0, 0, 0, 1em);
margin: 1em 0;
color: $baseFontColor;
@@ -152,9 +155,9 @@ th {
// modal - image zoom, fill window
.wrapper-modal-image {
.modal-ui-icon {
@extend %ui-fake-link;
position: absolute;
display: block;
padding: ($baseline/4) 7px;
@@ -175,6 +178,7 @@ th {
.image-link {
@extend %ui-fake-link;
position: relative;
display: block;
@@ -192,6 +196,7 @@ th {
.image-modal {
@extend %ui-fake-link;
@extend %ui-depth5;
position: fixed;
top: 0;
left: 0;
@@ -247,9 +252,11 @@ th {
&.action-zoom-in {
margin-right: ($baseline/4);
}
&.action-zoom-out {
margin-left: ($baseline/4);
}
&.is-disabled {
opacity: 0.5;
cursor: default;
@@ -275,11 +282,11 @@ th {
}
}
}
&.image-is-zoomed {
display: block;
.image-content .image-wrapper {
img {
max-width: none;
max-height: none;

View File

@@ -4,6 +4,7 @@
.CodeMirror {
@include box-sizing(border-box);
height: 435px;
}

View File

@@ -12,46 +12,48 @@ div.problem-progress {
div.lti {
// align center
margin: 0 auto;
// align center
margin: 0 auto;
.wrapper-lti-link {
@include font-size(14);
background-color: $sidebar-color;
padding: $baseline;
.wrapper-lti-link {
@include font-size(14);
.lti-link {
margin-bottom: 0;
text-align: right;
background-color: $sidebar-color;
padding: $baseline;
.link_lti_new_window {
@extend .gray-button;
@include font-size(13);
@include line-height(14);
}
}
.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 {
display: none;
}
form.ltiLaunchForm {
display: none;
}
iframe.ltiLaunchFrame {
width: 100%;
height: 800px;
display: block;
border: 0px;
}
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;
}
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);
div.problem-feedback {
margin-top: ($baseline/4);
margin-bottom: ($baseline/4);
}
}
}

View File

@@ -10,7 +10,7 @@ div.poll_question {
}
.inline {
display: inline;
display: inline;
}
h3 {
@@ -42,7 +42,7 @@ div.poll_question {
margin-bottom: $baseline;
&.short {
clear: both;
clear: both;
}
.question {
@@ -59,6 +59,7 @@ div.poll_question {
.button {
@extend %ui-fake-link;
-webkit-appearance: none;
-webkit-background-clip: padding-box;
-webkit-border-image: none;
@@ -94,13 +95,11 @@ div.poll_question {
/* display: inline-block; */
display: inline;
float: left;
font-family: 'Open Sans', Verdana, Geneva, sans-serif;
font-size: 13px;
font-style: normal;
font-variant: normal;
font-weight: bold;
letter-spacing: normal;
line-height: 25.59375px;
margin-bottom: ($baseline*0.75);
@@ -113,13 +112,12 @@ div.poll_question {
text-transform: none;
vertical-align: top;
white-space: pre-line;
width: 25px;
height: 25px;
word-spacing: 0px;
writing-mode: lr-tb;
}
.button.answered {
-webkit-box-shadow: rgb(97, 184, 225) 0px 1px 0px 0px inset;
background-color: rgb(29, 157, 217);
@@ -136,6 +134,7 @@ div.poll_question {
.text {
@extend %ui-fake-link;
display: inline;
float: left;
width: 80%;

View File

@@ -1,7 +1,5 @@
.editor-bar {
.editor-tabs {
.advanced-toggle {
height: auto;
margin-top: -4px;
@@ -47,9 +45,12 @@
left: 100%;
width: 0;
border-radius: 0 3px 3px 0;
@include linear-gradient(left, $shadow-l1, $transparent 4px);
background-color: $white;
overflow: hidden;
@include transition(width .3s linear 0s);
&.shown {
@@ -70,6 +71,7 @@
.row {
@include clearfix();
padding-bottom: 5px !important;
margin-bottom: 10px !important;
border-bottom: 1px solid #ddd !important;
@@ -88,7 +90,7 @@
margin-right: 30px;
.icon {
height: ($baseline * 1.5);
height: ($baseline * 1.5);
}
}
}
@@ -105,8 +107,8 @@
}
.problem-editor {
// adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror
.markdown-box+.CodeMirror {
// adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror
.markdown-box+.CodeMirror {
padding: 10px;
}
}

View File

@@ -9,6 +9,7 @@ $seq-nav-height: 44px;
// repeated extends - needed since LMS styling was referenced
.block-link {
@include border-left(1px solid $seq-nav-border-color);
display: block;
&:hover, &:focus {
@@ -18,6 +19,7 @@ $seq-nav-height: 44px;
.topbar {
@include clearfix();
border-bottom: 1px solid $seq-nav-border-color;
@media print {
@@ -27,6 +29,7 @@ $seq-nav-height: 44px;
a {
&.block-link {
@include border-left(1px solid $seq-nav-border-color);
display: block;
&:hover, &:focus {
@@ -43,7 +46,6 @@ $seq-nav-height: 44px;
background-repeat: no-repeat;
border: none;
border-radius: 0;
background-clip: border-box;
box-shadow: none;
box-sizing: content-box;
@@ -57,6 +59,7 @@ $seq-nav-height: 44px;
.sequence-nav {
@extend .topbar;
margin: 0 0 $baseline 0;
position: relative;
border-bottom: none;
@@ -74,6 +77,7 @@ $seq-nav-height: 44px;
.sequence-list-wrapper {
@extend %ui-depth2;
position: relative;
height: 100%;
flex-grow: 1;
@@ -151,7 +155,9 @@ $seq-nav-height: 44px;
.sequence-tooltip {
@include text-align(left);
@extend %ui-depth2;
margin-top: ($baseline/5);
background: $seq-nav-tooltip-color;
color: $white;
@@ -176,6 +182,7 @@ $seq-nav-height: 44px;
&::after {
@include transform(rotate(45deg));
@include right(18px);
background: $seq-nav-tooltip-color;
content: " ";
display: block;
@@ -197,6 +204,7 @@ $seq-nav-height: 44px;
.sequence-nav-button {
@extend %ui-depth3;
display: block;
top: 0;
height: 100%;

View File

@@ -3,6 +3,7 @@
.CodeMirror {
@include box-sizing(border-box);
width: 100%;
position: relative;
height: 379px;

View File

@@ -18,11 +18,13 @@
.editor-with-tabs {
@include clearfix();
position: relative;
.edit-header {
@include box-sizing(border-box);
padding: 18px $baseline;
top: 0 !important; // ugly override for second level tab override
right: 0;
@@ -62,17 +64,19 @@
margin-left: 8px;
a.tab {
@include font-size(14);
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
border: 1px solid $blue-d1;
border-radius: 3px;
padding: ($baseline/4) ($baseline);
background-color: $blue;
font-weight: bold;
color: $white;
@include font-size(14);
@include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0));
border: 1px solid $blue-d1;
border-radius: 3px;
padding: ($baseline/4) ($baseline);
background-color: $blue;
font-weight: bold;
color: $white;
&.current {
@include linear-gradient($blue, $blue);
color: $blue-d1;
box-shadow: inset 0 1px 2px 1px $shadow-l1;
background-color: $blue-d4;
@@ -81,7 +85,7 @@
&:hover, &:focus {
box-shadow: inset 0 1px 2px 1px $shadow;
background-image: linear-gradient(#009FE6, #009FE6) !important;
background-image: linear-gradient(#009fe6, #009fe6) !important;
}
}
}

View File

@@ -23,6 +23,7 @@ $a11y--blue-s1: saturate($blue,15%);
.a11y-menu-list {
@extend %ui-depth3;
top: 100%;
margin: 0;
padding: 0;
@@ -34,6 +35,7 @@ $a11y--blue-s1: saturate($blue,15%);
li {
@extend %ui-fake-link;
margin: 0;
padding: 0;
border-bottom: 1px solid #eee;
@@ -92,6 +94,7 @@ $a11y--blue-s1: saturate($blue,15%);
> a {
@include transition(all $tmg-f2 ease-in-out 0s);
@include font-size(12);
display: block;
border-radius: 0 3px 3px 0;
background-color: $very-light-text;
@@ -105,6 +108,7 @@ $a11y--blue-s1: saturate($blue,15%);
&:after {
@extend %use-font-awesome;
content: "\f0d7";
position: absolute;
right: ($baseline*0.5);
@@ -135,6 +139,7 @@ $a11y--blue-s1: saturate($blue,15%);
.contextmenu, .submenu {
@extend %ui-depth5;
border: 1px solid #333;
background: $white;
color: #333;
@@ -149,7 +154,7 @@ $a11y--blue-s1: saturate($blue,15%);
white-space: nowrap;
&.is-opened {
display: block;
display: block;
}
.menu-item, .submenu-item {
@@ -158,8 +163,8 @@ $a11y--blue-s1: saturate($blue,15%);
outline: none;
& > span {
color: #333;
}
color: #333;
}
&:first-child {
border-top: none;
@@ -217,6 +222,7 @@ $a11y--blue-s1: saturate($blue,15%);
.overlay {
@extend %ui-depth4;
position: fixed;
top: 0;
left: 0;

View File

@@ -17,7 +17,7 @@ $secondary-light: rgb(219, 139, 175); // UXPL secondary light
$cool-dark: rgb(79, 89, 93); // UXPL cool dark
& {
margin-bottom: ($baseline*1.5);
margin-bottom: ($baseline*1.5);
}
.is-hidden {
@@ -26,6 +26,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video {
@include clearfix();
background: rgb(245, 245, 245); // UXPL grayscale x-back
display: block;
margin: 0 -12px;
@@ -40,9 +41,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&.is-initialized {
.video-wrapper {
.spinner {
display: none;
}
@@ -51,7 +50,6 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
// CASE: video pre-roll state
&.is-pre-roll {
.slider {
visibility: hidden;
}
@@ -70,6 +68,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.tc-wrapper {
@include clearfix();
position: relative;
}
@@ -80,71 +79,72 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
height: 0px;
}
.downloads-heading {
margin: 1em 0 0 0;
.downloads-heading {
margin: 1em 0 0 0;
}
.wrapper-downloads {
display: flex;
.hd {
margin: 0;
}
.wrapper-downloads {
display: flex;
.wrapper-download-video,
.wrapper-download-transcripts,
.wrapper-handouts,
.branding {
flex: 1;
margin-top: $baseline;
.hd {
margin: 0;
}
@include padding-right($baseline);
.wrapper-download-video,
.wrapper-download-transcripts,
.wrapper-handouts,
.branding {
flex: 1;
margin-top: $baseline;
@include padding-right($baseline);
vertical-align: top;
}
.wrapper-download-video {
.video-sources {
margin: 0;
}
}
.wrapper-download-transcripts {
.list-download-transcripts {
margin: 0;
padding: 0;
list-style: none;
.transcript-option {
margin: 0;
}
}
}
.branding {
@include padding-right(0);
.host-tag {
position: absolute;
left: -9999em;
display: inline-block;
vertical-align: middle;
color: $base-font-color;
}
.brand-logo {
display: inline-block;
max-width: 100%;
max-height: ($baseline*2);
padding: ($baseline/4) 0;
vertical-align: middle;
}
}
vertical-align: top;
}
.wrapper-download-video {
.video-sources {
margin: 0;
}
}
.wrapper-download-transcripts {
.list-download-transcripts {
margin: 0;
padding: 0;
list-style: none;
.transcript-option {
margin: 0;
}
}
}
.branding {
@include padding-right(0);
.host-tag {
position: absolute;
left: -9999em;
display: inline-block;
vertical-align: middle;
color: $base-font-color;
}
.brand-logo {
display: inline-block;
max-width: 100%;
max-height: ($baseline*2);
padding: ($baseline/4) 0;
vertical-align: middle;
}
}
}
.video-wrapper {
@include float(left);
@include margin-right(flex-gutter(9));
width: flex-grid(6, 9);
background-color: black;
position: relative;
@@ -161,12 +161,13 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video-player-pre,
.video-player-post {
height: 50px;
background-color: rgb(17, 16, 16) // UXPL grayscale black;
height: 50px;
background-color: rgb(17, 16, 16) // UXPL grayscale black;
}
.spinner {
@include transform(translate(-50%, -50%));
position: absolute;
z-index: 1;
background: rgba(0, 0, 0, 0.7);
@@ -177,6 +178,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
&:after{
@include animation(rotateCW 3s infinite linear);
content: '';
display: block;
width: 30px;
@@ -190,6 +192,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.btn-play {
@include transform(translate(-50%, -50%));
position: absolute;
z-index: 1;
top: 46%;
@@ -214,6 +217,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.closed-captions {
@include left(5%);
position: absolute;
width: 90%;
box-sizing: border-box;
@@ -228,27 +232,29 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
background: rgba(0, 0, 0, .75);
color: $yellow;
&:before {
position: absolute;
display: inline-block;
top: 50%;
@include left($baseline);
margin-top: -.6em;
font-family: 'FontAwesome';
content: "\f142";
color: $white;
opacity: 0.5;
}
&:hover,
&.is-dragging {
background: rgba(0, 0, 0, 1.0);
cursor: move;
&:before {
position: absolute;
display: inline-block;
top: 50%;
@include left($baseline);
margin-top: -.6em;
font-family: 'FontAwesome';
content: "\f142";
color: $white;
opacity: 0.5;
}
&:hover,
&.is-dragging {
background: rgba(0, 0, 0, 1.0);
cursor: move;
&:before {
opacity: 1.0;
}
opacity: 1.0;
}
}
}
.video-player {
@@ -273,6 +279,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
iframe,
video {
@include left(0);
display: block;
border: none;
width: 100%;
@@ -290,6 +297,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video-controls {
@include clearfix();
position: relative;
border: 0;
background: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
@@ -297,7 +305,6 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
&:hover,
&:focus {
ul,
div {
opacity: 1;
@@ -307,6 +314,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
%video-control {
@extend %t-strong;
@extend %t-title7;
display: inline-block;
vertical-align: middle;
margin: 0;
@@ -348,6 +356,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
@include clearfix();
@include transform-origin(bottom left);
@include transition(height .7s ease-in-out 0s);
box-sizing: border-box;
position: absolute;
bottom: 100%;
@@ -375,8 +384,10 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.ui-slider-handle {
@extend %ui-fake-link;
@include transform-origin(bottom left);
@include transition(all .7s ease-in-out 0s);
box-sizing: border-box;
top: -1px;
height: ($baseline / 4);
@@ -398,17 +409,20 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.vcr {
@include float(left);
list-style: none;
@include border-right(1px solid rgb(40, 44, 46)); // UXPL grayscale-cool x-dark
padding: 0;
@media (max-width: 1120px) {
@include margin-right(lh(0.5));
font-size: em(14);
}
.video_control {
&:focus {
position: relative;
}
@@ -421,12 +435,14 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.vidtime {
@extend %t-strong;
@extend %t-title7;
@include padding-left(lh(.75));
display: inline-block;
color: rgb(207, 216, 220); // UXPL grayscale-cool light
-webkit-font-smoothing: antialiased;;
@media (max-width: 1120px) {
@media (max-width: 1120px) {
@include padding-left(lh(0.5));
}
}
@@ -448,7 +464,6 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.add-fullscreen,
.quality-control,
.toggle-transcript {
&:focus {
position: relative;
}
@@ -459,11 +474,15 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.menu {
@include transition(none);
@extend %ui-depth1;
position: absolute;
display: none;
bottom: ($baseline * 2);
@include right(0); // right-align menus since this whole collection is on the right
width: 120px;
margin: 0;
border: none;
@@ -474,11 +493,13 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
li {
@extend %ui-fake-link;
color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
.speed-option,
.control-lang {
@include text-align(left);
display: block;
width: 100%;
border: 0;
@@ -500,10 +521,10 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&.is-active {
.speed-option,
.control-lang {
@include border-left($baseline/10 solid rgb(14, 166, 236));
font-weight: $font-bold;
color: rgb(14, 166, 236); // UXPL primary accent
}
@@ -512,7 +533,6 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&.is-opened {
.menu {
display: block;
}
@@ -526,13 +546,9 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
.speeds {
&.is-opened {
.control {
.icon {
@include ltr {
@include transform(rotate(-90deg));
}
@@ -545,9 +561,9 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
.speed-button {
.label {
@include padding(0 ($baseline/3) 0 0);
font-family: $body-font-family;
color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
@@ -558,6 +574,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.value {
@include padding(0, lh(0.5), 0, 0);
color: rgb(231, 236, 238); // UXPL grayscale-cool x-light
font-weight: bold;
@@ -569,16 +586,13 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
.lang {
.language-menu {
width: $baseline;
padding: ($baseline / 2) 0;
}
.control {
.icon {
@include rtl {
@include transform(rotate(-180deg));
}
@@ -586,11 +600,8 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&.is-opened {
.control {
.icon {
@include ltr {
@include transform(rotate(90deg));
}
@@ -608,7 +619,6 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
position: relative;
&.is-opened {
.volume-slider-container {
display: block;
opacity: 1;
@@ -621,11 +631,15 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.volume-slider-container {
@include transition(none);
@extend %ui-depth1;
display: none;
position: absolute;
bottom: ($baseline * 2);
@include right(0);
width: 41px;
height: 120px;
background-color: rgb(40, 44, 46); // UXPL grayscale-cool x-dark
@@ -640,8 +654,10 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.ui-slider-handle {
@extend %ui-fake-link;
@include transition(height $tmg-s2 ease-in-out 0s, width $tmg-s2 ease-in-out 0s);
@include left(-5px);
box-sizing: border-box;
height: 13px;
width: 13px;
@@ -682,14 +698,12 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
.toggle-transcript {
&.is-active {
color: rgb(14, 166, 236); // UXPL primary accent
}
&.is-active {
color: rgb(14, 166, 236); // UXPL primary accent
}
}
.lang {
& > .hide-subtitles {
@include transition(none);
}
@@ -698,9 +712,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&:hover {
.video-controls {
.slider {
height: ($baseline / 1.5);
@@ -714,18 +726,18 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&.video-fullscreen {
.closed-captions {
width: 65%;
}
.closed-captions {
width: 65%;
}
&.closed .closed-captions {
width: 90%;
}
&.closed .closed-captions {
width: 90%;
}
}
.subtitles {
@include float(left);
overflow: auto;
max-height: 460px;
width: flex-grid(3, 9);
@@ -734,7 +746,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
visibility: visible;
a {
color: #0074b5;
color: #0074b5;
}
.subtitles-menu {
@@ -745,6 +757,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
li {
@extend %ui-fake-link;
margin-bottom: 8px;
border: 0;
padding: 0;
@@ -775,19 +788,18 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
&.spacing:last-of-type {
position: relative;
position: relative;
.transcript-end {
position: absolute;
bottom: 0;
}
.transcript-end {
position: absolute;
bottom: 0;
}
}
}
}
}
&.closed {
.video-wrapper {
width: flex-grid(9,9);
background-color: inherit;
@@ -803,7 +815,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video-wrapper .video-player-pre,
.video-wrapper .video-player-post {
height: 0;
height: 0;
}
.video-wrapper .video-player {
@@ -813,25 +825,27 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
}
.subtitles {
@extend .is-hidden;
@extend .is-hidden;
}
.subtitles.html5 {
@extend %ui-depth0;
background-color: rgba(243, 243, 243, 0.8);
height: 100%;
position: absolute;
right: 0;
bottom: 0;
top: 0;
width: 275px;
padding: 0 $baseline;
display: none;
@extend %ui-depth0;
background-color: rgba(243, 243, 243, 0.8);
height: 100%;
position: absolute;
right: 0;
bottom: 0;
top: 0;
width: 275px;
padding: 0 $baseline;
display: none;
}
}
&.video-fullscreen {
@extend %ui-depth4;
background: rgba(#000, .95);
border: 0;
bottom: 0;
@@ -855,11 +869,11 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video-wrapper .video-player-pre,
.video-wrapper .video-player-post {
height: 0;
height: 0;
}
.video-wrapper {
position: static;
position: static;
}
.video-wrapper .video-player {
@@ -870,15 +884,17 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.tc-wrapper {
@include clearfix();
width: 100%;
height: 100%;
position: static;
.video-wrapper {
height: 100%;
width: 75%;
@include margin-right(0);
vertical-align: middle;
object,
@@ -892,6 +908,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video-controls {
@extend %ui-depth4;
position: absolute;
bottom: 0;
left: 0;
@@ -903,8 +920,10 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
height: 100%;
width: 25%;
padding: lh();
@include box-sizing(border-box);
@include transition(none);
background: $black;
visibility: visible;
@@ -933,6 +952,7 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
.video-pre-roll {
@extend %ui-depth3;
position: absolute;
top: 0;
left: 0;

View File

@@ -1,24 +1,25 @@
.input-cloud {
margin: ($baseline/4);
margin: ($baseline/4);
}
.result_cloud_section {
display: none;
width: 0px;
height: 0px;
display: none;
width: 0px;
height: 0px;
}
.result_cloud_section.active {
display: block;
width: 100%;
height: auto;
margin-top: 1em;
display: block;
width: 100%;
height: auto;
margin-top: 1em;
h3 {
font-size: 100%;
}
h3 {
font-size: 100%;
}
}
.your_words{
font-size: 0.85em;
display: block;
font-size: 0.85em;
display: block;
}

View File

@@ -26,50 +26,57 @@
// inherited - dividers
.faded-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 1px;
width: 100%;
}
.faded-hr-divider-medium {
@include background-image(linear-gradient(180deg, rgba(240,240,240, 0) 0%,
rgba(240,240,240, 1) 50%,
rgba(240,240,240, 0)));
rgba(240,240,240, 1) 50%,
rgba(240,240,240, 0)));
height: 1px;
width: 100%;
}
.faded-hr-divider-light {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.8) 50%,
rgba(255,255,255, 0)));
rgba(255,255,255, 0.8) 50%,
rgba(255,255,255, 0)));
height: 1px;
width: 100%;
}
.faded-vertical-divider {
@include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 100%;
width: 1px;
}
.faded-vertical-divider-light {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.6) 50%,
rgba(255,255,255, 0)));
rgba(255,255,255, 0.6) 50%,
rgba(255,255,255, 0)));
height: 100%;
width: 1px;
}
.vertical-divider {
@extend .faded-vertical-divider;
position: relative;
&::after {
@extend .faded-vertical-divider-light;
content: "";
display: block;
position: absolute;
@@ -79,11 +86,14 @@
.horizontal-divider {
border: none;
@extend .faded-hr-divider;
position: relative;
&::after {
@extend .faded-hr-divider-light;
content: "";
display: block;
position: absolute;
@@ -93,13 +103,15 @@
.fade-right-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1)));
rgba(200,200,200, 1)));
border: none;
}
.fade-left-hr-divider {
@include background-image(linear-gradient(180deg, rgba(200,200,200, 1) 0%,
rgba(200,200,200, 0)));
rgba(200,200,200, 0)));
border: none;
}
@@ -108,6 +120,7 @@
// inherited - ui
.window {
@include clearfix();
box-shadow: 0 1px 1px $shadow-l1;
border-radius: 3px;
margin-bottom: $baseline;
@@ -120,8 +133,10 @@
// mixins - grandfathered
@mixin button {
@include transition(background-color 0.15s, box-shadow 0.15s);
@extend %t-action3;
@extend %t-strong;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3) inset, 0 0 0 $transparent;
display: inline-block;
padding: ($baseline/5) $baseline ($baseline/4);
@@ -133,6 +148,7 @@
color: $gray-d1 !important;
pointer-events: none;
cursor: none;
&:hover, &:focus {
box-shadow: 0 0 0 0 !important;
}
@@ -146,6 +162,7 @@
@mixin green-button {
@include button;
@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;
border: 1px solid $uxpl-green-base;
border-radius: 3px;
@@ -168,6 +185,7 @@
@mixin blue-button {
@include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
border: 1px solid $uxpl-blue-base;
border-radius: 3px;
background-color: $uxpl-blue-base;
@@ -189,6 +207,7 @@
@mixin red-button {
@include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
border: 1px solid $red-d1;
border-radius: 3px;
background-color: $red;
@@ -210,6 +229,7 @@
@mixin pink-button {
@include button;
@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
border: 1px solid $pink-d1;
border-radius: 3px;
background-color: $pink;
@@ -231,6 +251,7 @@
@mixin orange-button {
@include button;
@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;
border: 1px solid $orange-d1;
border-radius: 3px;
@@ -253,6 +274,7 @@
@mixin white-button {
@include button;
@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;
border: 1px solid $mediumGrey;
border-radius: 3px;
@@ -269,6 +291,7 @@
@mixin grey-button {
@include button;
@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;
border: 1px solid $gray-d2;
border-radius: 3px;
@@ -284,6 +307,7 @@
.gray-button {
@include button;
@include linear-gradient(top, $white-t1, rgba(255, 255, 255, 0));
box-shadow: 0 1px 0 $white-t1 inset;
border: 1px solid $gray-d1;
border-radius: 3px;
@@ -319,6 +343,7 @@
h5 {
@extend %t-strong;
margin-bottom: 8px;
color: $white;
}
@@ -331,11 +356,13 @@
.save-button {
@include blue-button;
margin-top: 0;
}
.cancel-button {
@include white-button;
margin-top: 0;
}
}
@@ -345,6 +372,7 @@
// sunsetted mixins
@mixin active {
@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;
background-color: rgba(255, 255, 255, 0.3);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);

View File

@@ -98,11 +98,13 @@
@include keyframes(bounceIn) {
0% {
opacity: 0.0;
@include transform(scale(0.3));
}
50% {
opacity: 1.0;
@include transform(scale(1.05));
}
@@ -119,11 +121,13 @@
50% {
opacity: 1.0;
@include transform(scale(1.05));
}
100% {
opacity: 0.0;
@include transform(scale(0.3));
}
}
@@ -144,11 +148,11 @@
// flash - double
@include keyframes(flashDouble) {
0%, 50%, 100% {
opacity: 1.0;
}
0%, 50%, 100% {
opacity: 1.0;
}
25%, 75% {
25%, 75% {
opacity: 0.0;
}
}

View File

@@ -61,6 +61,7 @@ $spacing-horizontal: (
}
@warn "Unknown `#{$key}` in $spacing-vertical.";
@return null;
}
@@ -71,6 +72,7 @@ $spacing-horizontal: (
}
@warn "Unknown `#{$key}` in $spacing-horizontal.";
@return null;
}
@@ -104,6 +106,7 @@ $font-sizes: (
}
@warn "Unknown `#{$key}` in $font-sizes.";
@return null;
}
@@ -114,6 +117,7 @@ $font-sizes: (
}
@warn "Unknown `#{$key}` in $font-weights.";
@return null;
}
@@ -233,8 +237,10 @@ $btn-small-padding-horizontal: spacing-horizontal(small);
@mixin notification-by-type($color) {
border-top: 3px solid $color;
.icon {
@include margin-right(3 * $baseline/ 4);
color: $color;
}
}

View File

@@ -1,5 +1,4 @@
@function new-breakpoint($query:$feature $value $columns, $total-columns: $grid-columns) {
@if length($query) == 1 {
$query: $default-feature nth($query, 1) $total-columns;
}

View File

@@ -31,11 +31,13 @@
@function container-span($span: $span) {
@if length($span) == 3 {
$container-columns: nth($span, 3);
@return $container-columns;
}
@else if length($span) == 2 {
$container-columns: nth($span, 2);
@return $container-columns;
}
@@ -49,11 +51,13 @@
@if length($shift) == 3 {
$container-columns: nth($shift, 3);
@return $container-columns;
}
@else if length($shift) == 2 {
$container-columns: nth($shift, 2);
@return $container-columns;
}
@@ -95,7 +99,9 @@
@if $layout == LTR or $layout == RTL {
$direction: direction-from-layout($layout);
} @else {
}
@else {
$direction: direction-from-layout($default);
}
@@ -107,7 +113,9 @@
@if $layout == LTR {
$direction: right;
} @else {
}
@else {
$direction: left;
}

View File

@@ -3,6 +3,7 @@
@media screen and ($default-feature: nth($query, 1)) {
$default-grid-columns: $grid-columns;
$grid-columns: $total-columns !global;
@content;
$grid-columns: $default-grid-columns !global;
}
@@ -20,6 +21,7 @@
}
$i: 1;
@while $i <= $loopTo {
$mediaQuery: $mediaQuery + '(' + nth($query, $i) + ': ' + nth($query, $i + 1) + ') ';

View File

@@ -5,7 +5,9 @@
@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."
} @else {
}
@else {
$direction: get-direction($layout-direction, $default-layout-direction);
}

View File

@@ -1,5 +1,6 @@
@mixin outer-container {
@include clearfix();
max-width: $max-width;
margin: {
left: auto;

View File

@@ -1,8 +1,10 @@
@mixin pad($padding: flex-gutter()) {
$padding-list: null;
@each $value in $padding {
$value: if($value == 'default', flex-gutter(), $value);
$padding-list: join($padding-list, $value);
}
padding: $padding-list;
}

View File

@@ -8,11 +8,13 @@ $layout-direction: nil !default;
@function flex-grid($columns, $container-columns: $fg-max-columns) {
$width: $columns * $fg-column + ($columns - 1) * $fg-gutter;
$container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
@return percentage($width / $container-width);
}
@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) {
$container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
@return percentage($gutter / $container-width);
}
@@ -23,7 +25,9 @@ $layout-direction: nil !default;
@function get-parent-columns($columns) {
@if $columns != $grid-columns {
$parent-columns: $columns !global;
} @else {
}
@else {
$parent-columns: $grid-columns !global;
}
@@ -35,7 +39,9 @@ $layout-direction: nil !default;
@if $container-is-display-table == true {
$display-table: true;
} @else if $display == table {
}
@else if $display == table {
$display-table: true;
}

View File

@@ -4,7 +4,9 @@
@if $display == table {
display: table;
@include fill-parent;
table-layout: fixed;
$container-display-table: true !global;
}

View File

@@ -13,7 +13,9 @@
@if $display-table {
display: table-cell;
width: percentage($columns / $container-columns);
} @else {
}
@else {
float: #{$opposite-direction};
@if $display != no-display {
@@ -31,7 +33,9 @@
width: flex-grid($columns, $container-columns);
}
} @else {
}
@else {
margin-#{$direction}: flex-gutter($container-columns);
width: flex-grid($columns, $container-columns);

View File

@@ -5,6 +5,7 @@
@media screen and ($default-feature: nth($query, 1)) {
$default-grid-columns: $grid-columns;
$grid-columns: $total-columns;
@content;
$grid-columns: $default-grid-columns;
}
@@ -14,6 +15,7 @@
@media screen and (nth($query, 1): nth($query, 2)) {
$default-grid-columns: $grid-columns;
$grid-columns: $total-columns;
@content;
$grid-columns: $default-grid-columns;
}
@@ -23,6 +25,7 @@
@media screen and (nth($query, 1): nth($query, 2)) {
$default-grid-columns: $grid-columns;
$grid-columns: nth($query, 3);
@content;
$grid-columns: $default-grid-columns;
}
@@ -32,6 +35,7 @@
@media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
$default-grid-columns: $grid-columns;
$grid-columns: $total-columns;
@content;
$grid-columns: $default-grid-columns;
}
@@ -41,6 +45,7 @@
@media screen and (nth($query, 1): nth($query, 2)) and (nth($query, 3): nth($query, 4)) {
$default-grid-columns: $grid-columns;
$grid-columns: nth($query, 5);
@content;
$grid-columns: $default-grid-columns;
}
@@ -53,5 +58,6 @@
@mixin nth-omega($nth, $display: block, $direction: default) {
@warn "The nth-omega() mixin is deprecated. Please use omega() instead.";
@include omega($nth $display, $direction);
}

View File

@@ -11,7 +11,9 @@
body:before {
content: '';
display: inline-block;
@include grid-column-gradient(gradient-stops($grid-columns));
height: 100%;
left: 0;
margin: 0 auto;

View File

@@ -1,5 +1,5 @@
$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-opacity: 0.4 !default;
$visual-grid-breakpoints: () !default;

View File

@@ -262,5 +262,5 @@ $sans-serif: $f-sans-serif;
$body-line-height: golden-ratio(.875em, 1);
// carried over from LMS for xmodules
$action-primary-active-bg: #1AA1DE; // $m-blue
$action-primary-active-bg: #1aa1de; // $m-blue
$very-light-text: $white;