Merge pull request #6099 from edx/marco/sass-variable-patterns-cleanup

SASS compilation variable conventions update
This commit is contained in:
Marco Morales
2015-01-06 14:47:24 -05:00
118 changed files with 2013 additions and 1676 deletions

View File

@@ -4,7 +4,7 @@
* that the LMS did, so the quick fix was to localize the LMS variables not shared by the CMS.
* -Abarrett and Vshnayder
*/
$annotatable--border-color: #C8C8C8;
$annotatable--border-color: $gray-l3;
$annotatable--body-font-size: em(14);
.annotatable-wrapper {
@@ -16,7 +16,7 @@ $annotatable--body-font-size: em(14);
.annotatable-title {
font-size: em(22);
text-transform: uppercase;
padding: 2px 4px;
padding: ($baseline/10) ($baseline/5);
}
}
@@ -24,8 +24,8 @@ $annotatable--body-font-size: em(14);
position: relative;
padding: .5em 1em;
border: 1px solid $annotatable--border-color;
border-radius: .5em;
margin-bottom: .5em;
border-radius: 0.5em;
margin-bottom: 0.5em;
&.shaded { background-color: #EDEDED; }
@@ -35,9 +35,9 @@ $annotatable--body-font-size: em(14);
}
.annotatable-section-body {
border-top: 1px solid $annotatable--border-color;
margin-top: .5em;
padding-top: .5em;
@include clearfix;
margin-top: 0.5em;
padding-top: 0.5em;
@include clearfix();
}
ul.instructions-template {
@@ -62,8 +62,8 @@ $annotatable--body-font-size: em(14);
}
.annotatable-span {
@extend %ui-fake-link;
display: inline;
cursor: pointer;
$highlight_index: 0;
@each $highlight in (
@@ -108,18 +108,18 @@ $annotatable--body-font-size: em(14);
font-size: $annotatable--body-font-size;
border: 1px solid #333;
border-radius: 1em;
background-color: rgba(0,0,0,.85);
color: #fff;
background-color: rgba(0,0,0,0.85);
color: $white;
-webkit-font-smoothing: antialiased;
.ui-tooltip-titlebar {
font-size: em(16);
color: inherit;
background-color: transparent;
padding: 5px 10px;
padding: ($baseline/4) ($baseline/2);
border: none;
.ui-tooltip-title {
padding: 5px 0px;
padding: ($baseline/4) 0;
border-bottom: 2px solid #333;
font-weight: bold;
}
@@ -129,7 +129,7 @@ $annotatable--body-font-size: em(14);
}
.ui-state-hover {
color: inherit;
border: 1px solid #ccc;
border: 1px solid $gray-l3;
}
}
.ui-tooltip-content {
@@ -137,7 +137,7 @@ $annotatable--body-font-size: em(14);
font-size: em(14);
text-align: left;
font-weight: 400;
padding: 0 10px 10px 10px;
padding: 0 ($baseline/2) ($baseline/2) ($baseline/2);
background-color: transparent;
border-color: transparent;
}
@@ -150,10 +150,10 @@ $annotatable--body-font-size: em(14);
.ui-tooltip.qtip.ui-tooltip-annotatable {
max-width: 375px;
.ui-tooltip-content {
padding: 0 10px;
padding: 0 ($baseline/2);
.annotatable-comment {
display: block;
margin: 0px 0px 10px 0;
margin: 0 0 ($baseline/2) 0;
max-height: 225px;
overflow: auto;
line-height: normal;
@@ -161,7 +161,7 @@ $annotatable--body-font-size: em(14);
.annotatable-reply {
display: block;
border-top: 2px solid #333;
padding: 5px 0;
padding: ($baseline/4) 0;
margin: 0;
text-align: center;
}
@@ -174,8 +174,8 @@ $annotatable--body-font-size: em(14);
left: 50%;
height: 0;
width: 0;
margin-left: -5px;
margin-left: -($baseline/4);
border: 10px solid transparent;
border-top-color: rgba(0, 0, 0, .85);
border-top-color: rgba(0, 0, 0, 0.85);
}
}

View File

@@ -2,12 +2,12 @@ $annotation-yellow: rgba(255,255,10,0.3);
h2 {
margin-top: 0;
margin-bottom: 15px;
margin-bottom: ($baseline*0.75);
&.problem-header {
display: inline-block;
section.staff {
margin-top: 30px;
margin-top: ($baseline*1.5);
font-size: 80%;
}
}
@@ -33,7 +33,7 @@ iframe[seamless]{
div.problem-progress {
display: inline-block;
padding-left: 5px;
padding-left: ($baseline/4);
color: #666;
font-weight: 100;
font-size: em(16);
@@ -55,7 +55,7 @@ div.problem {
}
.choicegroup {
@include clearfix;
@include clearfix();
min-width: 100px;
width: auto !important;
width: 100px;
@@ -63,18 +63,18 @@ div.problem {
label {
@include float(left);
clear: both;
margin-bottom: 5px;
margin-bottom: ($baseline/4);
&.choicegroup_correct {
&:after {
margin-left: 15px;
margin-left: ($baseline*0.75);
content: url('../images/correct-icon.png');
}
}
&.choicegroup_incorrect {
&:after {
margin-left: 15px;
margin-left: ($baseline*0.75);
content: url('../images/incorrect-icon.png');
}
}
@@ -123,7 +123,7 @@ div.problem {
display: block;
border: 1px solid #ddd;
padding: 9px 15px $baseline;
background: #fff;
background: $white;
position: relative;
box-shadow: inset 0 0 0 1px #eee;
border-radius: 3px;
@@ -138,9 +138,9 @@ div.problem {
> span {
margin: $baseline 0;
display: block;
border: 1px solid #000;
border: 1px solid $black;
padding: 9px 15px $baseline;
background: #fff;
background: $white;
position: relative;
box-shadow: inset 0 0 0 1px #eee;
border-radius: 3px;
@@ -214,7 +214,7 @@ div.problem {
> span {
display: block;
margin-bottom: lh(.5);
margin-bottom: lh(0.5);
}
p.answer {
@@ -246,7 +246,7 @@ div.problem {
img.loading {
display: inline-block;
padding-left: 10px;
padding-left: ($baseline/2);
}
span {
@@ -317,11 +317,11 @@ div.problem {
.grader-status {
@include clearfix;
@include clearfix();
margin: $baseline/2 0;
padding: $baseline/2;
border-radius: 5px;
background: #F6F6F6;
background: $gray-l6;
span {
display: block;
@@ -350,7 +350,7 @@ div.problem {
padding: $baseline 0 0 0;
border: 0;
border-top: 1px solid #eee;
background: #fff;
background: $white;
p.debug {
display: none;
@@ -364,7 +364,7 @@ div.problem {
}
.evaluation {
p {
margin-bottom: 4px;
margin-bottom: ($baseline/5);
}
}
@@ -393,7 +393,7 @@ div.problem {
margin-left: 50px;
&:first-child {
margin-left: 0px;
margin-left: 0;
}
label {
@@ -449,7 +449,7 @@ div.problem {
}
li {
margin-bottom: lh(.5);
margin-bottom: lh(0.5);
line-height: 1.4em;
&:last-child {
@@ -513,7 +513,7 @@ div.problem {
padding: 0px 5px;
border: 1px solid #eaeaea;
border-radius: 3px;
background-color: #f8f8f8;
background-color: $gray-l6;
white-space: nowrap;
font-size: .9em;
}
@@ -521,9 +521,9 @@ div.problem {
pre {
overflow: auto;
padding: 6px $baseline/2;
border: 1px solid #ccc;
border: 1px solid $gray-l3;
border-radius: 3px;
background-color: #f8f8f8;
background-color: $gray-l6;
font-size: .9em;
line-height: 1.4;
@@ -562,12 +562,12 @@ div.problem {
resize: none;
&.CodeMirror-cursor {
@extend %ui-depth1;
position: absolute;
z-index: 10;
visibility: hidden;
width: 0;
border-right: none;
border-left: 1px solid black;
border-left: 1px solid $black;
}
}
}
@@ -602,7 +602,7 @@ div.problem {
display: block;
margin: lh() 0;
padding: lh();
border: 1px solid #ccc;
border: 1px solid $gray-l3;
}
div.action {
@@ -631,7 +631,7 @@ div.problem {
// border: 1px solid #ddd;
// border-radius: 3px;
// padding: 8px 12px;
// margin-top: 10px;
// margin-top: ($baseline/2);
display: inline-block;
margin-top: 8px;
@include margin-left($baseline/2);
@@ -711,13 +711,13 @@ div.problem {
}
.hints {
border: 1px solid #ccc;
border: 1px solid $gray-l3;
h3 {
padding: 9px;
border-bottom: 1px solid #e3e3e3;
background: #eee;
text-shadow: 0 1px 0 #fff;
text-shadow: 0 1px 0 $white;
font-weight: bold;
font-size: em(16);
}
@@ -737,8 +737,8 @@ div.problem {
a {
display: block;
padding: 9px;
background: #f6f6f6;
box-shadow: inset 0 0 0 1px #fff;
background: $gray-l6;
box-shadow: inset 0 0 0 1px $white;
}
}
@@ -765,11 +765,11 @@ div.problem {
> section {
position: relative;
margin-bottom: $baseline/2;
margin-bottom: ($baseline/2);
padding: 9px 9px $baseline;
border: 1px solid #ddd;
border-radius: 3px;
background: #fff;
background: $white;
box-shadow: inset 0 0 0 1px #eee;
p:last-of-type {
@@ -781,20 +781,20 @@ div.problem {
}
a.full {
@include position(absolute, 0 0px 1px 0px);
@include position(absolute, 0 0 1px 0);
@include box-sizing(border-box);
display: block;
padding: 4px;
background: #f3f3f3;
padding: ($baseline/5);
background: $gray-l4;
text-align: right;
font-size: 1em;
&.full-top {
@include position(absolute, 1px 0px auto 0px);
@include position(absolute, 1px 0 auto 0);
}
&.full-bottom {
@include position(absolute, auto 0px 1px 0px);
@include position(absolute, auto 0 1px 0);
}
}
}
@@ -822,8 +822,8 @@ div.problem {
padding: 0;
.result-errors {
margin: $baseline/4;
padding: $baseline/2 $baseline/2 $baseline/2 $baseline*2;
margin: ($baseline/4);
padding: ($baseline/2) ($baseline/2) ($baseline/2) ($baseline*2);
background: url('../images/incorrect-icon.png') center left no-repeat;
li {
@@ -833,7 +833,7 @@ div.problem {
.result-output {
margin: $baseline/4;
padding: $baseline 0 15px 50px;
padding: $baseline 0 ($baseline*0.75) 50px;
border-top: 1px solid #ddd;
border-left: $baseline solid #fafafa;
@@ -872,7 +872,7 @@ div.problem {
}
.markup-text{
margin: 5px;
margin: ($baseline/4);
padding: $baseline 0 15px 50px;
border-top: 1px solid #ddd;
border-left: 20px solid #fafafa;
@@ -891,19 +891,19 @@ div.problem {
.rubric {
tr {
margin: $baseline/2 0;
margin: ($baseline/2) 0;
height: 100%;
}
td {
margin: $baseline/2 0;
margin: ($baseline/2) 0;
padding: $baseline 0;
height: 100%;
}
th {
margin: $baseline/4;
padding: $baseline/4;
margin: ($baseline/4);
padding: ($baseline/4);
}
label,
@@ -911,12 +911,12 @@ div.problem {
position: relative;
display: inline-block;
margin: 3px;
padding: 15px;
padding: ($baseline*0.75);
min-width: 50px;
min-height: 50px;
width: 150px;
height: 100%;
background-color: #ccc;
background-color: $gray-l3;
font-size: .9em;
}
@@ -924,7 +924,7 @@ div.problem {
position: absolute;
right: 0;
bottom: 0;
margin: $baseline/2;
margin: ($baseline/2);
}
.selected-grade {
@@ -944,12 +944,12 @@ div.problem {
.annotation-input {
margin: 0 0 1em 0;
border: 1px solid #ccc;
border: 1px solid $gray-l3;
border-radius: 1em;
.annotation-header {
padding: .5em 1em;
border-bottom: 1px solid #ccc;
border-bottom: 1px solid $gray-l3;
font-weight: bold;
}
@@ -989,10 +989,10 @@ div.problem {
margin: 1em 0 0 0;
.tag {
@extend %ui-fake-link;
display: inline-block;
margin-left: $baseline*2;
margin-left: ($baseline*2);
border: 1px solid rgb(102,102,102);
cursor: pointer;
&.selected {
background-color: $annotation-yellow;
@@ -1022,13 +1022,13 @@ div.problem {
.debug-value {
margin: 1em 0;
padding: 1em;
border: 1px solid #000;
border: 1px solid $black;
background-color: #999;
color: #fff;
color: $white;
input[type="text"] { width: 100%; }
pre { background-color: #CCC; color: #000; }
pre { background-color: $gray-l3; color: $black; }
&:before {
display: block;

View File

@@ -3,11 +3,11 @@
h2 {
margin-top: 0;
margin-bottom: 15px;
margin-bottom: ($baseline*0.75);
&.problem-header {
section.staff {
margin-top: 30px;
margin-top: ($baseline*1.5);
font-size: 80%;
}
}
@@ -21,7 +21,7 @@ h2 {
// Problem Header
div.name{
padding-bottom: 15px;
padding-bottom: ($baseline*0.75);
h2 {
display: inline;
@@ -39,14 +39,14 @@ div.name{
}
section.combined-open-ended {
@include clearfix;
@include clearfix();
.written-feedback {
position: relative;
margin: 0px;
margin: 0;
height: 150px;
border: 1px solid lightgray;
padding: 5px;
padding: ($baseline/4);
resize: vertical;
width: 99%;
overflow: auto;
@@ -64,11 +64,11 @@ section.combined-open-ended {
div.problemwrapper {
border: 1px solid lightgray;
border-radius: $baseline/2;
border-radius: ($baseline/2);
.status-bar {
background-color: #eee;
border-radius: $baseline/2 $baseline/2 0 0;
border-radius: ($baseline/2) ($baseline/2) 0 0;
border-bottom: 1px solid lightgray;
.statustable {
@@ -81,33 +81,33 @@ div.problemwrapper {
text-align: center;
.status-elements {
border-radius: $baseline/4;
border-radius: ($baseline/4);
border: 1px solid lightgray;
}
}
.problemtype-container {
padding: $baseline/2;
padding: ($baseline/2);
width: 60%;
}
.problemtype{
padding: $baseline/2;
padding: ($baseline/2);
}
.assessments-container {
float: right;
padding: $baseline/2 $baseline $baseline/2 $baseline/2;
padding: ($baseline/2) $baseline ($baseline/2) ($baseline/2);
.assessment-text {
display: inline-block;
display: table-cell;
padding-right: $baseline/2;
padding-right: ($baseline/2);
}
}
}
.item-container {
padding-bottom: $baseline/2;
padding-bottom: ($baseline/2);
margin: 15px;
}
@@ -120,11 +120,11 @@ div.problemwrapper {
section.legend-container {
margin: 15px;
border-radius: $baseline/4;
border-radius: ($baseline/4);
.legenditem {
display: inline;
padding: $baseline/2;
padding: ($baseline/2);
width: 20%;
background-color: #eee;
font-size: .9em;
@@ -136,7 +136,7 @@ section.combined-open-ended-status {
.statusitem {
display: table-cell;
padding: $baseline/2;
padding: ($baseline/2);
width: 30px;
border-right: 1px solid lightgray;
background-color: #eee;
@@ -144,16 +144,16 @@ section.combined-open-ended-status {
font-size: .9em;
&:first-child {
border-radius: $baseline/4 0 0 $baseline/4;
border-radius: ($baseline/4) 0 0 ($baseline/4);
}
&:last-child {
border-right: 0;
border-radius: 0 $baseline/4 $baseline/4 0;
border-radius: 0 ($baseline/4) ($baseline/4) 0;
}
&:only-child {
border-radius: $baseline/4;
border-radius: ($baseline/4);
}
.show-results {
@@ -167,7 +167,7 @@ section.combined-open-ended-status {
}
.statusitem-current {
background-color: #fff;
background-color: $white;
color: #222;
}
@@ -226,7 +226,7 @@ section.combined-open-ended-status {
.section-header {
display: block;
float: right;
padding-top: $baseline/2;
padding-top: ($baseline/2);
width: 15%;
text-align: center;
font-size: .9em;
@@ -236,33 +236,33 @@ section.combined-open-ended-status {
.wrapper-score-selection {
display: table-cell;
padding: 0 $baseline/2;
padding: 0 ($baseline/2);
width: 20px;
vertical-align: middle;
}
.wrappable {
display: table-cell;
padding: $baseline/4;
padding: ($baseline/4);
}
.rubric-list-item {
margin-bottom: 2px;
padding: $baseline/2;
margin-bottom: ($baseline/10);
padding: ($baseline/2);
&:hover, &:focus {
background-color: #eee;
}
.rubric-label-selected{
border-radius: $baseline/4;
border-radius: ($baseline/4);
background-color: #eee;
}
}
span.rubric-category {
display: block;
margin-bottom: $baseline/2;
padding-top: $baseline/2;
margin-bottom: ($baseline/2);
padding-top: ($baseline/2);
width: 100%;
border-bottom: 1px solid lightgray;
font-size: 1.1em;
@@ -270,25 +270,25 @@ span.rubric-category {
div.combined-rubric-container {
margin: 15px;
padding-top: $baseline/2;
padding-bottom: $baseline/4;
padding-top: ($baseline/2);
padding-bottom: ($baseline/4);
ul.rubric-list {
margin: 0 $baseline $baseline/2 $baseline;
margin: 0 $baseline ($baseline/2) $baseline;
padding: 0;
list-style-type: none;
li {
&.rubric-list-item {
margin-bottom: 2px;
padding: $baseline/2;
margin-bottom: ($baseline/10);
padding: ($baseline/2);
}
}
}
h4 {
padding-top: $baseline/2;
padding-top: ($baseline/2);
}
span.rubric-category {
@@ -301,34 +301,34 @@ div.combined-rubric-container {
label.choicegroup_correct {
&:before {
margin-right: 15px;
margin-right: ($baseline*0.75);
content: url('../images/correct-icon.png');
}
}
label.choicegroup_partialcorrect {
&:before {
margin-right: 15px;
margin-right: ($baseline*0.75);
content: url('../images/partially-correct-icon.png');
}
}
label.choicegroup_incorrect {
&:before {
margin-right: 15px;
margin-right: ($baseline*0.75);
content: url('../images/incorrect-icon.png');
}
}
div.written-feedback {
background: #f6f6f6;
padding: 5px;
background: $gray-l6;
padding: ($baseline/4);
}
}
div.result-container {
padding-top: $baseline/2;
padding-bottom: $baseline/4;
padding-top: ($baseline/2);
padding-bottom: ($baseline/4);
.evaluation {
p {
@@ -342,7 +342,7 @@ div.result-container {
}
.evaluation-response {
margin-bottom: 2px;
margin-bottom: ($baseline/10);
header {
a {
@@ -372,11 +372,11 @@ div.result-container {
}
.submit-message-container {
margin: $baseline/2 0;
margin: ($baseline/2) 0;
}
.external-grader-message {
margin-bottom: $baseline/4;
margin-bottom: ($baseline/4);
section {
padding-left: $baseline;
@@ -384,7 +384,7 @@ div.result-container {
color: #2c2c2c;
font-family: monospace;
font-size: 1em;
padding-top: $baseline/2;
padding-top: ($baseline/2);
padding-bottom: 30px;
header {
@@ -400,8 +400,8 @@ div.result-container {
margin: 0;
.result-errors {
margin: $baseline/4;
padding: $baseline/2 $baseline/2 $baseline/2 $baseline*2;
margin: ($baseline/4);
padding: ($baseline/2) ($baseline/2) ($baseline/2) ($baseline*2);
background: url('../images/incorrect-icon.png') center left no-repeat;
li {
@@ -410,8 +410,8 @@ div.result-container {
}
.result-output {
margin: $baseline/4;
padding: $baseline 0 15px 50px;
margin: ($baseline/4);
padding: $baseline 0 ($baseline*0.75) ($baseline*2.5);
border-top: 1px solid #ddd;
border-left: 20px solid #fafafa;
@@ -434,8 +434,8 @@ div.result-container {
}
.markup-text{
margin: $baseline/4;
padding: $baseline 0 15px 50px;
margin: ($baseline/4);
padding: $baseline 0 ($baseline*0.75) ($baseline*2.5);
border-top: 1px solid #ddd;
border-left: 20px solid #fafafa;
@@ -452,13 +452,13 @@ div.result-container {
}
.rubric-result-container {
padding: 2px;
padding: ($baseline/10);
margin: 0;
display: inline;
.rubric-result {
font-size: .9em;
padding: 2px;
padding: ($baseline/10);
display: inline-table;
}
}
@@ -466,16 +466,16 @@ div.result-container {
div.rubric {
ul.rubric-list{
margin: 0 $baseline $baseline/2 $baseline;
margin: 0 $baseline ($baseline/2) $baseline;
padding: 0;
list-style: none;
list-style-type: none;
li {
&.rubric-list-item {
margin-bottom: 2px;
padding: $baseline/2;
border-radius: $baseline/4;
margin-bottom: ($baseline/10);
padding: ($baseline/2);
border-radius: ($baseline/4);
&:hover, &:focus {
background-color: #eee;
@@ -483,14 +483,14 @@ div.rubric {
.wrapper-score-selection {
display: table-cell;
padding: 0 $baseline/2;
padding: 0 ($baseline/2);
width: 20px;
vertical-align: middle;
}
.wrappable {
display: table-cell;
padding: $baseline/4;
padding: ($baseline/4);
}
}
}
@@ -540,7 +540,7 @@ section.open-ended-child {
padding: 9px 15px $baseline;
border: 1px solid #ddd;
border-radius: 3px;
background: #fff;
background: $white;
box-shadow: inset 0 0 0 1px #eee;
&:empty {
@@ -554,7 +554,7 @@ section.open-ended-child {
margin-top: -2px;
}
&.status {
margin: 8px 0 0 $baseline/2;
margin: 8px 0 0 ($baseline/2);
text-indent: -9999px;
}
}
@@ -610,13 +610,13 @@ section.open-ended-child {
> span {
display: block;
margin-bottom: lh(.5);
margin-bottom: lh(0.5);
}
p.answer {
display: inline-block;
margin-bottom: 0;
margin-left: $baseline/2;
margin-left: ($baseline/2);
&:before {
content: "Answer: ";
@@ -671,26 +671,26 @@ section.open-ended-child {
.reload {
float:right;
margin: $baseline/2;
margin: ($baseline/2);
}
div.short-form-response {
@include clearfix;
@include clearfix();
overflow-y: auto;
margin-bottom: 0;
padding: $baseline/2;
padding: ($baseline/2);
min-height: 20px;
height: auto;
border: 1px solid #ddd;
background: #f6f6f6;
background: $gray-l6;
}
.grader-status {
@include clearfix;
margin: $baseline/2 0;
padding: $baseline/2;
@include clearfix();
margin: ($baseline/2) 0;
padding: ($baseline/2);
border-radius: 5px;
background: #f6f6f6;
background: $gray-l6;
span {
display: block;
@@ -718,7 +718,7 @@ section.open-ended-child {
padding: $baseline 0 0 0;
border: 0;
border-top: 1px solid #eee;
background: #fff;
background: $white;
p.debug {
display: none;
@@ -731,7 +731,7 @@ section.open-ended-child {
}
form.option-input {
margin: -$baseline/2 0 $baseline;
margin: -($baseline/2) 0 $baseline;
padding-bottom: $baseline;
select {
@@ -741,8 +741,8 @@ section.open-ended-child {
ul {
margin-bottom: lh();
margin-left: .75em;
margin-left: .75rem;
margin-left: 0.75em;
margin-left: 0.75rem;
}
ul.rubric-list{
@@ -755,7 +755,7 @@ section.open-ended-child {
&.rubric-list-item {
margin-bottom: 0;
padding: 0;
border-radius: $baseline/4;
border-radius: ($baseline/4);
}
}
}
@@ -827,7 +827,7 @@ section.open-ended-child {
.submission_feedback {
display: inline-block;
margin: 8px 0 0 $baseline/2;
margin: 8px 0 0 ($baseline/2);
color: #666;
font-style: italic;
-webkit-font-smoothing: antialiased;
@@ -850,8 +850,8 @@ section.open-ended-child {
div.open-ended-alert,
.save_message {
margin-top: $baseline/2;
margin-bottom: $baseline/4;
margin-top: ($baseline/2);
margin-bottom: ($baseline/4);
padding: 8px 12px;
border: 1px solid #ebe8bf;
border-radius: 3px;
@@ -860,8 +860,8 @@ section.open-ended-child {
}
div.capa_reset {
margin-top: $baseline/2;
margin-bottom: $baseline/2;
margin-top: ($baseline/2);
margin-bottom: ($baseline/2);
padding: 25px;
border: 1px solid $error-red;
border-radius: 3px;
@@ -878,7 +878,7 @@ section.open-ended-child {
}
.assessment-container {
margin: $baseline*2 0px 30px 0px;
margin: ($baseline*2) 0 ($baseline*1.5) 0;
.scoring-container {
p {
@@ -887,10 +887,10 @@ section.open-ended-child {
label {
display: inline-block;
margin: $baseline/2;
padding: $baseline/4;
margin: ($baseline/2);
padding: ($baseline/4);
min-width: 50px;
background-color: #ccc;
background-color: $gray-l3;
text-size: 1.5em;
}
@@ -960,18 +960,18 @@ section.open-ended-child {
.staff-grading {
.breadcrumbs {
padding: $baseline/10;
background-color: #f6f6f6;
padding: ($baseline/10);
background-color: $gray-l6;
border-radius: 5px;
margin-bottom: $baseline/2;
margin-bottom: ($baseline/2);
}
.prompt-wrapper {
padding-top: $baseline/2;
padding-top: ($baseline/2);
.meta-info-wrapper {
padding: $baseline/2;
border-radius: $baseline/4;
padding: ($baseline/2);
border-radius: 5px;
}
}
}
@@ -979,7 +979,7 @@ section.open-ended-child {
section.peer-grading-container{
div.peer-grading{
section.calibration-feedback {
padding: 20px;
padding: $baseline;
}
}
}
@@ -988,6 +988,6 @@ div.staff-info{
background-color: #eee;
border-radius: 10px;
border-bottom: 1px solid lightgray;
padding: 10px;
margin: 10px 0px 10px 0px;
padding: ($baseline/2);
margin: ($baseline/2) 0 ($baseline/2) 0;
}

View File

@@ -27,7 +27,7 @@
width: 21px;
height: 21px;
padding: 0;
margin: 0 5px 0 15px;
margin: 0 ($baseline/4) 0 ($baseline*0.75);
border-radius: 22px;
border: 1px solid #a5aaaf;
background: #e5ecf3;
@@ -45,8 +45,8 @@
left: 100%;
width: 0;
border-radius: 0 3px 3px 0;
@include linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 4px);
background-color: #fff;
@include linear-gradient(left, $shadow-l1, $transparent 4px);
background-color: $white;
overflow: hidden;
@include transition(width .3s linear 0s);
@@ -67,7 +67,7 @@
}
.row {
@include clearfix;
@include clearfix();
padding-bottom: 5px !important;
margin-bottom: 10px !important;
border-bottom: 1px solid #ddd !important;

View File

@@ -2,8 +2,8 @@
box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.1);
border-radius: 2px;
display: none;
margin-top: 20px;
padding: (15px);
margin-top: $baseline;
padding: ($baseline*0.75);
background: rgb(253, 248, 235);
}
@@ -14,23 +14,23 @@
}
.vote {
padding-top: 0px !important;
padding-bottom: 0px !important;
padding-top: 0 !important;
padding-bottom: 0 !important;
}
.wizard-view {
float: left;
width: 790px;
margin-right: 10px;
margin-right: ($baseline/2);
}
.wizard-container {
width: 3000px;
-webkit-transition:all 1.0s ease-in-out;
-moz-transition:all 1.0s ease-in-out;
-o-transition:all 1.0s ease-in-out;
transition:all 1.0s ease-in-out;
-webkit-transition:all $tmg-s1 ease-in-out;
-moz-transition:all $tmg-s1 ease-in-out;
-o-transition:all $tmg-s1 ease-in-out;
transition:all $tmg-s1 ease-in-out;
}
.wizard-viewbox {

View File

@@ -7,16 +7,16 @@
}
.editor-bar {
position: relative;
@include clearfix();
@include linear-gradient(top, #d4dee8, #c9d5e2);
padding: 5px;
position: relative;
padding: ($baseline/4);
border-bottom-color: #a5aaaf;
@include clearfix;
a {
display: block;
float: left;
padding: 3px 10px 7px;
padding: 3px ($baseline/2) 7px;
margin-left: 7px;
border-radius: 2px;
@@ -33,7 +33,7 @@
li {
float: left;
margin-right: 5px;
margin-right: ($baseline/4);
&:last-child {
margin-right: 0;
@@ -46,15 +46,15 @@
padding: 7px 20px 3px;
border: 1px solid #a5aaaf;
border-radius: 3px 3px 0 0;
@include linear-gradient(top, rgba(0, 0, 0, 0) 87%, rgba(0, 0, 0, .06));
@include linear-gradient(top, $transparent 87%, rgba(0, 0, 0, .06));
background-color: #e5ecf3;
font-size: 13px;
color: #3c3c3c;
box-shadow: 1px -1px 1px rgba(0, 0, 0, .05);
&.current {
background: #fff;
border-bottom-color: #fff;
background: $white;
border-bottom-color: $white;
}
}
}

View File

@@ -5,7 +5,7 @@ section.foldit {
table {
border: 1px solid lighten($leaderboard, 10%);
border-collapse: collapse;
margin-top: 20px;
margin-top: $baseline;
}
th {
background: $leaderboard;
@@ -13,7 +13,7 @@ section.foldit {
}
td {
background: lighten($leaderboard, 3%);
border-bottom: 1px solid #fff;
border-bottom: 1px solid $white;
padding: 8px;
}
}

View File

@@ -14,13 +14,13 @@ h2 {
color: #646464;
font: normal 1.2em/1.2em $sans-serif;
letter-spacing: 1px;
margin-bottom: 15px;
margin-bottom: ($baseline*0.75);
text-transform: uppercase;
-webkit-font-smoothing: antialiased;
}
h3, h4, h5, h6 {
margin: 0 0 10px 0;
margin: 0 0 ($baseline/2) 0;
font-weight: 600;
}
@@ -64,11 +64,11 @@ strong, b {
}
p + p, ul + p, ol + p {
margin-top: 20px;
margin-top: $baseline;
}
blockquote {
margin: 1em 40px;
margin: 1em ($baseline*2);
}
ol, ul {
@@ -117,14 +117,14 @@ code {
table {
width: 100%;
margin: 20px 0;
margin: $baseline 0;
border-collapse: collapse;
font-size: 16px;
td, th {
margin: 20px 0;
padding: 10px;
border: 1px solid #ccc;
margin: $baseline 0;
padding: ($baseline/2);
border: 1px solid $gray-l3;
font-size: 14px;
&.cont-justified-left {
@@ -154,10 +154,10 @@ th {
.wrapper-modal-image {
.modal-ui-icon {
@extend %ui-fake-link;
position: absolute;
display: block;
padding: 5px 7px;
cursor: pointer;
padding: ($baseline/4) 7px;
border-radius: 5px;
opacity: .9;
background: $white;
@@ -174,9 +174,9 @@ th {
}
.image-link {
@extend %ui-fake-link;
position: relative;
display: block;
cursor: pointer;
.action-fullscreen {
display: none;
@@ -190,14 +190,14 @@ th {
}
.image-modal {
@extend %ui-fake-link;
@extend %ui-depth5;
position: fixed;
top: 0;
left: 0;
display: none;
height: 100%;
width: 100%;
@extend %ui-depth5;
cursor: pointer;
background-color: rgba(0, 0, 0, 0.7);
.image-content {
@@ -245,13 +245,13 @@ th {
position: relative;
&.action-zoom-in {
margin-right: 5px;
margin-right: ($baseline/4);
}
&.action-zoom-out {
margin-left: 5px;
margin-left: ($baseline/4);
}
&.is-disabled {
opacity: .5;
opacity: 0.5;
cursor: default;
}
}

View File

@@ -4,7 +4,7 @@ h2.problem-header {
div.problem-progress {
display: inline-block;
padding-left: 5px;
padding-left: ($baseline/4);
color: #666;
font-weight: 100;
font-size: em(16);
@@ -50,8 +50,8 @@ div.lti {
}
div.problem-feedback {
margin-top: 5px;
margin-bottom: 5px;
margin-top: ($baseline/4);
margin-bottom: ($baseline/4);
}
}

View File

@@ -15,13 +15,13 @@ div.poll_question {
h3 {
margin-top: 0;
margin-bottom: 15px;
margin-bottom: ($baseline*0.75);
color: #fe57a1;
font-size: 1.9em;
&.problem-header {
div.staff {
margin-top: 30px;
margin-top: ($baseline*1.5);
font-size: 80%;
}
}
@@ -39,7 +39,7 @@ div.poll_question {
}
.poll_answer {
margin-bottom: 20px;
margin-bottom: $baseline;
&.short {
clear: both;
@@ -58,6 +58,7 @@ div.poll_question {
}
.button {
@extend %ui-fake-link;
-webkit-appearance: none;
-webkit-background-clip: padding-box;
-webkit-border-image: none;
@@ -89,7 +90,6 @@ div.poll_question {
box-shadow: rgb(255, 255, 255) 0px 1px 0px 0px inset;
box-sizing: border-box;
color: rgb(51, 51, 51);
cursor: pointer;
/* display: inline-block; */
display: inline;
@@ -103,8 +103,8 @@ div.poll_question {
letter-spacing: normal;
line-height: 25.59375px;
margin-bottom: 15px;
margin: 0px;
margin-bottom: ($baseline*0.75);
margin: 0;
padding: 0px;
text-align: center;
text-decoration: none;
@@ -135,15 +135,15 @@ div.poll_question {
}
.text {
@extend %ui-fake-link;
display: inline;
float: left;
width: 80%;
text-align: left;
min-height: 30px;
margin-left: 20px;
margin-left: $baseline;
height: auto;
margin-bottom: 20px;
cursor: pointer;
margin-bottom: $baseline;
&.short {
width: 100px;
@@ -153,7 +153,7 @@ div.poll_question {
.stats {
min-height: 40px;
margin-top: 20px;
margin-top: $baseline;
clear: both;
&.short {
@@ -170,7 +170,7 @@ div.poll_question {
border: 1px solid black;
display: inline;
float: left;
margin-right: 10px;
margin-right: ($baseline/2);
&.short {
width: 65%;

View File

@@ -45,8 +45,8 @@
left: 100%;
width: 0;
border-radius: 0 3px 3px 0;
@include linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 4px);
background-color: #fff;
@include linear-gradient(left, $shadow-l1, $transparent 4px);
background-color: $white;
overflow: hidden;
@include transition(width .3s linear 0s);
@@ -67,7 +67,7 @@
}
.row {
@include clearfix;
@include clearfix();
padding-bottom: 5px !important;
margin-bottom: 10px !important;
border-bottom: 1px solid #ddd !important;

View File

@@ -36,42 +36,42 @@ nav.sequence-nav {
// TODO (cpennington): This doesn't work anymore. XModules aren't able to
// import from external sources.
@extend .topbar;
margin: -4px 0 30px;
margin: -4px 0 ($baseline*1.5);
position: relative;
border-bottom: none;
.left-shadow {
@extend %ui-depth4;
@include linear-gradient(left, $shadow, $transparent);
position: absolute;
top: 0;
left: 0;
z-index: 9999;
width: 20px;
height: 46px;
@include linear-gradient(left, rgba(0, 0, 0, .2), rgba(0, 0, 0, 0));
background-color: transparent;
pointer-events: none;
}
.right-shadow {
@extend %ui-depth4;
@include linear-gradient(right, $shadow, $transparent);
position: absolute;
top: 0;
right: 0;
z-index: 9999;
width: 20px;
height: 46px;
@include linear-gradient(right, rgba(0, 0, 0, .2), rgba(0, 0, 0, 0));
background-color: transparent;
pointer-events: none;
}
.sequence-list-wrapper {
position: relative;
z-index: 99;
border: 1px solid #ccc;
height: 44px;
margin: 0 30px;
@extend %ui-depth2;
@include linear-gradient(top, #ddd, #eee);
box-shadow: 0 1px 3px rgba(0, 0, 0, .1) inset;
position: relative;
border: 1px solid $gray-l3;
height: 44px;
margin: 0 ($baseline*1.5);
box-shadow: 0 1px 3px $shadow-l1 inset;
}
ol {
@@ -82,7 +82,7 @@ nav.sequence-nav {
display: table;
height: 100%;
margin: 0;
padding: 0 10px;
padding: 0 ($baseline/2);
width: 100%;
a {
@@ -94,31 +94,31 @@ nav.sequence-nav {
min-width: 20px;
a {
@extend %ui-fake-link;
@include transition(none);
width: 100%;
height: 42px;
margin: 0;
background-position: center 14px;
background-repeat: no-repeat;
border: 1px solid transparent;
cursor: pointer;
display: block;
padding: 0;
position: relative;
@include transition(none);
/* &:focus {
outline: 0;
}
*/
&:hover, &:focus {
background-color: #fff;
background-color: $white;
background-repeat: no-repeat;
background-position: center 14px;
}
&.active {
background-color: #fff;
z-index: 9;
@extend %ui-depth1;
background-color: $white;
// &:after {
// content: '▲';
@@ -132,7 +132,7 @@ nav.sequence-nav {
// }
&:hover, &:focus {
background-color: #fff;
background-color: $white;
background-repeat: no-repeat;
background-position: center 14px;
}
@@ -197,19 +197,19 @@ nav.sequence-nav {
}
p {
@extend %ui-depth2;
background: #333;
color: #fff;
color: $white;
font-family: $sans-serif;
line-height: lh();
right: 0px;
right: 0;
opacity: 0.0;
padding: 6px;
position: absolute;
top: 48px;
text-shadow: 0 -1px 0 #000;
text-shadow: 0 -1px 0 $black;
@include transition(all .1s $ease-in-out-quart 0s);
white-space: pre;
z-index: 99;
visibility: hidden;
pointer-events: none;
@@ -238,7 +238,7 @@ nav.sequence-nav {
&:hover, &:focus {
p {
display: block;
margin-top: 4px;
margin-top: ($baseline/5);
opacity: 1.0;
visibility: visible;
}
@@ -263,7 +263,7 @@ nav.sequence-nav {
margin-bottom: 0;
height: 44px;
width: 70px;
border: 1px solid #ccc;
border: 1px solid $gray-l3;
@include linear-gradient(top, #eee, #ddd);
box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset;
z-index: 1;
@@ -357,7 +357,7 @@ nav.sequence-bottom {
@include float(left);
width: 50px;
height: 44px;
border: 1px solid #ccc;
border: 1px solid $gray-l3;
@include linear-gradient(top, #eee, #ddd);
box-shadow: 0 1px 0 rgba(255, 255, 255, .7) inset;
@@ -369,7 +369,7 @@ nav.sequence-bottom {
background-repeat: no-repeat;
border: none;
display: block;
padding: lh(.5) 4px;
padding: lh(0.5) 4px;
text-indent: -9999px;
overflow: hidden;
@include transition(all .2s $ease-in-out-quad 0s);

View File

@@ -22,22 +22,22 @@ $a11y--blue-s1: saturate($blue,15%);
}
.a11y-menu-list {
@extend %ui-depth1;
top: 100%;
margin: 0;
padding: 0;
display: none;
position: absolute;
z-index: 10;
list-style: none;
background-color: $white;
border: 1px solid #eee;
li {
@extend %ui-fake-link;
margin: 0;
padding: 0;
border-bottom: 1px solid #eee;
color: $white;
cursor: pointer;
a {
display: block;
@@ -90,12 +90,12 @@ $a11y--blue-s1: saturate($blue,15%);
}
> a {
@include transition(all 0.25s ease-in-out 0s);
@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;
padding: ($baseline*.75 $baseline*1.25 $baseline*.75 $baseline*.75);
padding: ($baseline*0.75) ($baseline*1.25) ($baseline*0.75) ($baseline*0.75);
color: $a11y--gray-l2;
min-width: 1.5em;
line-height: 14px;
@@ -107,7 +107,7 @@ $a11y--blue-s1: saturate($blue,15%);
@extend %use-font-awesome;
content: "\f0d7";
position: absolute;
right: ($baseline*.5);
right: ($baseline*0.5);
top: 33%;
color: $lighter-base-font-color;
}
@@ -122,7 +122,7 @@ $a11y--blue-s1: saturate($blue,15%);
a {
border: 0;
display: block;
padding: lh(.5);
padding: lh(0.5);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -134,8 +134,9 @@ $a11y--blue-s1: saturate($blue,15%);
.contextmenu, .submenu {
@extend %ui-depth5;
border: 1px solid #333;
background: #fff;
background: $white;
color: #333;
padding: 0;
margin: 0;
@@ -143,7 +144,6 @@ $a11y--blue-s1: saturate($blue,15%);
position: absolute;
top: 0;
display: none;
z-index: 999999;
outline: none;
cursor: default;
white-space: nowrap;
@@ -153,8 +153,8 @@ $a11y--blue-s1: saturate($blue,15%);
}
.menu-item, .submenu-item {
border-top: 1px solid #ccc;
padding: 5px 10px;
border-top: 1px solid $gray-l3;
padding: ($baseline/4) ($baseline/2);
outline: none;
& > span {
@@ -167,17 +167,17 @@ $a11y--blue-s1: saturate($blue,15%);
&:focus {
background: #333;
color: #fff;
color: $white;
& > span {
color: #fff;
color: $white;
}
}
}
.submenu-item {
position: relative;
padding: 5px 20px 5px 10px;
padding: ($baseline/4) $baseline ($baseline/4) ($baseline/2);
&:after {
content: '\25B6';
@@ -193,10 +193,10 @@ $a11y--blue-s1: saturate($blue,15%);
&.is-opened {
background: #333;
color: #fff;
color: $white;
& > span {
color: #fff;
color: $white;
}
& > .submenu {
@@ -211,16 +211,16 @@ $a11y--blue-s1: saturate($blue,15%);
.is-disabled {
pointer-events: none;
color: #ccc;
color: $gray-l3;
}
}
.overlay {
@extend %ui-depth5;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 900000;
background-color: transparent;
}

View File

@@ -1,5 +1,5 @@
& {
margin-bottom: 30px;
margin-bottom: ($baseline*1.5);
}
.is-hidden {
@@ -28,7 +28,7 @@ div.video {
}
div.tc-wrapper {
@include clearfix;
@include clearfix();
position: relative;
}
@@ -46,16 +46,16 @@ div.video {
.video-download-button{
display: inline-block;
vertical-align: top;
margin: ($baseline*.75) ($baseline/2) 0 0;
margin: ($baseline*0.75) ($baseline/2) 0 0;
> a {
@include transition(all 0.25s ease-in-out 0s);
@include transition(all $tmg-f2 ease-in-out 0s);
@include font-size(14);
line-height : 14px;
float: left;
border-radius: 3px;
background-color: $very-light-text;
padding: ($baseline*.75);
padding: ($baseline*0.75);
color: $lighter-base-font-color;
&:hover, &:focus {
@@ -126,7 +126,7 @@ div.video {
height: 0px;
border-style: solid;
border-width: 30px 0 30px 50px;
border-color: transparent transparent transparent #ffffff;
border-color: transparent transparent transparent $white;
position: relative;
}
}
@@ -161,9 +161,9 @@ div.video {
section.video-controls {
@include clearfix();
background: #333;
border: 1px solid #000;
border: 1px solid $black;
border-top: 0;
color: #ccc;
color: $gray-l3;
position: relative;
&:hover, &:focus {
@@ -173,6 +173,7 @@ div.video {
}
%video-button {
@extend %ui-fake-link;
@include transition(none);
display: block;
font-weight: 800;
@@ -183,21 +184,20 @@ div.video {
text-indent: -9999px;
-webkit-font-smoothing: antialiased;
box-shadow: 1px 0 0 #555, inset 1px 0 0 #555;
color: #fff;
cursor: pointer;
color: $white;
border-width: 0 1px;
border-style: solid;
border-color: #000;
border-color: $black;
&:hover, &:focus {
background-color: #444;
color: #fff;
color: $white;
text-decoration: none;
}
&:active,
&:focus {
color: #fff;
color: $white;
background-color: #444;
text-decoration: none;
}
@@ -207,9 +207,9 @@ div.video {
@include clearfix();
@include transform(scaleY(0.5) translate3d(0, 50%, 0));
background: #c2c2c2;
border: 1px solid #000;
border: 1px solid $black;
border-radius: 0;
border-top: 1px solid #000;
border-top: 1px solid $black;
box-shadow: inset 0 1px 0 #eee, 0 1px 0 #555;
position: absolute;
z-index: 1;
@@ -235,13 +235,13 @@ div.video {
}
a.ui-slider-handle {
@extend %ui-fake-link;
@include transform(scale(.7, 1.3) translate3d(-80%, -15%, 0));
background: $pink url(../images/slider-handle.png) center center no-repeat;
background-size: 50%;
border: 1px solid darken($pink, 20%);
border-radius: 50%;
box-shadow: inset 0 1px 0 lighten($pink, 10%);
cursor: pointer;
height: 20px;
margin-left: 0;
top: 0;
@@ -264,7 +264,7 @@ div.video {
padding: 0;
@media (max-width: 1120px) {
margin-right: lh(.5);
margin-right: lh(0.5);
font-size: em(14);
}
@@ -283,9 +283,9 @@ div.video {
width: 14px;
&:focus {
@extend %ui-depth4;
position: relative;
z-index: 10000;
outline: #fff dotted thin;
outline: $white dotted thin;
outline-offset: -2px;
}
@@ -309,7 +309,7 @@ div.video {
-webkit-font-smoothing: antialiased;
padding-left: lh(.75);
@media (max-width: 1120px) {
padding-left: lh(.5);
padding-left: lh(0.5);
}
}
}
@@ -326,9 +326,9 @@ div.video {
// overflow is used to bypass Firefox CSS :focus outline bug
// http://johndoesdesign.com/blog/2012/css/firefox-and-its-css-focus-outline-bug/
&:focus {
@extend %ui-depth5;
position: relative;
z-index: 10000;
outline: #fff dotted thin;
outline: $white dotted thin;
outline-offset: -2px;
overflow: auto;
}
@@ -350,26 +350,26 @@ div.video {
.menu {
@include transition(none);
@extend %ui-depth1;
box-shadow: inset 1px 0 0 #555, 0 1px 0 #444;
background-color: #444;
border: 1px solid #000;
border: 1px solid $black;
bottom: 46px;
display: none;
opacity: 0;
position: absolute;
z-index: 10;
li {
@extend %ui-fake-link;
box-shadow: 0 1px 0 #555;
border-bottom: 1px solid #000;
color: #fff;
cursor: pointer;
border-bottom: 1px solid $black;
color: $white;
a {
border: 0;
color: #fff;
color: $white;
display: block;
padding: lh(.5);
padding: lh(0.5);
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -430,7 +430,7 @@ div.video {
font-size: em(14);
font-weight: normal;
letter-spacing: 1px;
padding: 0 lh(.25) 0 lh(.5);
padding: 0 lh(0.25) 0 lh(0.5);
line-height: 46px;
text-transform: uppercase;
color: #999;
@@ -444,14 +444,14 @@ div.video {
float: left;
font-weight: bold;
margin-bottom: 0;
padding: 0 lh(.5) 0 0;
padding: 0 lh(0.5) 0 0;
@media (max-width: 1120px) {
padding: 0 lh(.5) 0 lh(.5);
padding: 0 lh(0.5) 0 lh(0.5);
}
line-height: 46px;
color: #fff;
color: $white;
}
}
}
@@ -486,9 +486,10 @@ div.video {
.volume-slider-container {
@include transition(none);
@extend %ui-depth1;
box-shadow: inset 1px 0 0 #555, 0 3px 0 #444;
background-color: #444;
border: 1px solid #000;
border: 1px solid $black;
bottom: 46px;
display: none;
opacity: 0;
@@ -496,7 +497,6 @@ div.video {
width: 45px;
height: 125px;
margin-left: -1px;
z-index: 10;
.volume-slider {
height: 100px;
@@ -504,17 +504,17 @@ div.video {
width: 5px;
margin: 14px auto;
background: #666;
border: 1px solid #000;
border: 1px solid $black;
box-shadow: 0 1px 0 #333;
a.ui-slider-handle {
@include transition(height 2.0s ease-in-out 0s, width 2.0s ease-in-out 0s);
@extend %ui-fake-link;
@include transition(height $tmg-s2 ease-in-out 0s, width $tmg-s2 ease-in-out 0s);
background: $pink url(../images/slider-handle.png) center center no-repeat;
background-size: 50%;
border: 1px solid darken($pink, 20%);
border-radius: 15px;
box-shadow: inset 0 1px 0 lighten($pink, 10%);
cursor: pointer;
height: 15px;
left: -6px;
width: 15px;
@@ -607,9 +607,9 @@ div.video {
visibility: visible;
li {
@extend %ui-fake-link;
border: 0;
color: rgb(29,157,217);
cursor: pointer;
margin-bottom: 8px;
padding: 0;
line-height: lh();
@@ -629,7 +629,7 @@ div.video {
}
&:empty {
margin-bottom: 0px;
margin-bottom: 0;
}
}
}
@@ -643,15 +643,15 @@ div.video {
}
article.video-wrapper section.video-controls.html5 {
bottom: 0px;
left: 0px;
right: 0px;
bottom: 0;
left: 0;
right: 0;
position: absolute;
z-index: 1;
}
article.video-wrapper div.video-player-pre, article.video-wrapper div.video-player-post {
height: 0px;
height: 0;
}
article.video-wrapper section.video-player {
@@ -666,6 +666,7 @@ div.video {
}
ol.subtitles.html5 {
@extend %ui-depth0;
background-color: rgba(243, 243, 243, 0.8);
height: 100%;
position: absolute;
@@ -673,13 +674,13 @@ div.video {
bottom: 0;
top: 0;
width: 275px;
padding: 0 20px;
z-index: 0;
padding: 0 $baseline;
display: none;
}
}
&.video-fullscreen {
@extend %ui-depth4;
background: rgba(#000, .95);
border: 0;
bottom: 0;
@@ -690,7 +691,6 @@ div.video {
position: fixed;
top: 0;
width: 100%;
z-index: 9999;
vertical-align: middle;
border-radius: 0;
@@ -703,7 +703,7 @@ div.video {
}
article.video-wrapper div.video-player-pre, article.video-wrapper div.video-player-post {
height: 0px;
height: 0;
}
article.video-wrapper {
@@ -717,7 +717,7 @@ div.video {
}
div.tc-wrapper {
@include clearfix;
@include clearfix();
width: 100%;
height: 100%;
@@ -737,18 +737,18 @@ div.video {
}
section.video-controls {
@extend %ui-depth4;
bottom: 0;
left: 0;
position: absolute;
width: 100%;
z-index: 9999;
width: 100%;
}
}
ol.subtitles {
@include box-sizing(border-box);
@include transition(none);
background: #000;
background: $black;
height: 100%;
width: 25%;
padding: lh();
@@ -758,7 +758,7 @@ div.video {
color: #aaa;
&.current {
color: #fff;
color: $white;
}
}
}

View File

@@ -1,5 +1,5 @@
.input-cloud {
margin: 5px;
margin: ($baseline/4);
}
.result_cloud_section {