Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use sass interpolation instead of concatenation for -path

Browse Source
This commit is contained in:
Ned Batchelder
2015-08-27 16:01:23 -04:00
committed by David Baumgold
parent 5d64f9a80b
commit c0856232e1
32 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/lib/xmodule/xmodule/css/capa/display.scss
View File

@@ -321,7 +321,7 @@ div.problem {
display: inline-block;
width: 14px;
height: 14px;
background: url($static-path + '/images/unanswered-icon.png') center center no-repeat;
background: url('#{$static-path}/images/unanswered-icon.png') center center no-repeat;
}
}
@@ -330,7 +330,7 @@ div.problem {
display: inline-block;
width: 25px;
height: 20px;
background: url($static-path + '/images/correct-icon.png') center center no-repeat;
background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
}
input {
@@ -343,7 +343,7 @@ div.problem {
display: inline-block;
width: 20px;
height: 20px;
background: url($static-path + '/images/spinner.gif') center center no-repeat;
background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
}
input {
@@ -356,7 +356,7 @@ div.problem {
display: inline-block;
width: 20px;
height: 20px;
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
}
input {
@@ -370,7 +370,7 @@ div.problem {
display: inline-block;
width: 20px;
height: 20px;
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
}
input {
@@ -448,7 +448,7 @@ div.problem {
top: 4px;
width: 14px;
height: 14px;
background: url($static-path + '/images/unanswered-icon.png') center center no-repeat;
background: url('#{$static-path}/images/unanswered-icon.png') center center no-repeat;
}
&.processing, &.ui-icon-processing {
@@ -457,7 +457,7 @@ div.problem {
top: 6px;
width: 25px;
height: 20px;
background: url($static-path + '/images/spinner.gif') center center no-repeat;
background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
}
&.ui-icon-check {
@@ -466,7 +466,7 @@ div.problem {
top: 3px;
width: 25px;
height: 20px;
background: url($static-path + '/images/correct-icon.png') center center no-repeat;
background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
}
&.incomplete, &.ui-icon-close {
@@ -475,7 +475,7 @@ div.problem {
top: 3px;
width: 20px;
height: 20px;
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
}
}
@@ -503,7 +503,7 @@ div.problem {
.grading {
margin: 0px 7px 0 0;
padding-left: 25px;
background: url($static-path + '/images/info-icon.png') left center no-repeat;
background: url('#{$static-path}/images/info-icon.png') left center no-repeat;
text-indent: 0px;
}
@@ -1097,7 +1097,7 @@ div.problem {
.result-errors {
margin: ($baseline/4);
padding: ($baseline/2) ($baseline/2) ($baseline/2) ($baseline*2);
background: url($static-path + '/images/incorrect-icon.png') center left no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center left no-repeat;
li {
color: #b00;
@@ -1129,7 +1129,7 @@ div.problem {
}
.result-correct {
background: url($static-path + '/images/correct-icon.png') left 20px no-repeat;
background: url('#{$static-path}/images/correct-icon.png') left 20px no-repeat;
.result-actual-output {
color: #090;
@@ -1137,7 +1137,7 @@ div.problem {
}
.result-incorrect {
background: url($static-path + '/images/incorrect-icon.png') left 20px no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') left 20px no-repeat;
.result-actual-output {
color: #B00;
@@ -1348,7 +1348,7 @@ div.problem {
label.choicetextgroup_show_correct, section.choicetextgroup_show_correct {
&:after {
margin-left:15px;
content: url($static-path + '/images/correct-icon.png');
content: url('#{$static-path}/images/correct-icon.png');
}
}
@@ -1373,11 +1373,11 @@ div.problem .imageinput.capa_inputtype {
}
.correct {
background: url($static-path + '/images/correct-icon.png') center center no-repeat;
background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
}
.incorrect {
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
}
.partially-correct {

32
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
View File

@@ -178,7 +178,7 @@ section.combined-open-ended-status {
float: right;
width: 14px;
height: 14px;
background: url($static-path + '/images/unanswered-icon.png') center center no-repeat;
background: url('#{$static-path}/images/unanswered-icon.png') center center no-repeat;
}
&.correct {
@@ -187,7 +187,7 @@ section.combined-open-ended-status {
float: right;
width: 25px;
height: 20px;
background: url($static-path + '/images/correct-icon.png') center center no-repeat;
background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
}
&.incorrect {
@@ -196,7 +196,7 @@ section.combined-open-ended-status {
float: right;
width: 20px;
height: 20px;
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
}
}
@@ -302,21 +302,21 @@ div.combined-rubric-container {
label.choicegroup_correct {
&:before {
margin-right: ($baseline*0.75);
content: url($static-path + '/images/correct-icon.png');
content: url('#{$static-path}/images/correct-icon.png');
}
}
label.choicegroup_partialcorrect {
&:before {
margin-right: ($baseline*0.75);
content: url($static-path + '/images/partially-correct-icon.png');
content: url('#{$static-path}/images/partially-correct-icon.png');
}
}
label.choicegroup_incorrect {
&:before {
margin-right: ($baseline*0.75);
content: url($static-path + '/images/incorrect-icon.png');
content: url('#{$static-path}/images/incorrect-icon.png');
}
}
@@ -402,7 +402,7 @@ div.result-container {
.result-errors {
margin: ($baseline/4);
padding: ($baseline/2) ($baseline/2) ($baseline/2) ($baseline*2);
background: url($static-path + '/images/incorrect-icon.png') center left no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center left no-repeat;
li {
color: #B00;
@@ -564,7 +564,7 @@ section.open-ended-child {
display: inline-block;
width: 14px;
height: 14px;
background: url($static-path + '/images/unanswered-icon.png') center center no-repeat;
background: url('#{$static-path}/images/unanswered-icon.png') center center no-repeat;
}
}
@@ -573,7 +573,7 @@ section.open-ended-child {
display: inline-block;
width: 25px;
height: 20px;
background: url($static-path + '/images/correct-icon.png') center center no-repeat;
background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
}
input {
@@ -586,7 +586,7 @@ section.open-ended-child {
display: inline-block;
width: 20px;
height: 20px;
background: url($static-path + '/images/spinner.gif') center center no-repeat;
background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
}
input {
@@ -599,7 +599,7 @@ section.open-ended-child {
display: inline-block;
width: 20px;
height: 20px;
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
text-indent: -9999px;
}
@@ -638,7 +638,7 @@ section.open-ended-child {
top: 4px;
width: 14px;
height: 14px;
background: url($static-path + '/images/unanswered-icon.png') center center no-repeat;
background: url('#{$static-path}/images/unanswered-icon.png') center center no-repeat;
}
&.processing, &.ui-icon-processing {
@@ -647,7 +647,7 @@ section.open-ended-child {
top: 6px;
width: 25px;
height: 20px;
background: url($static-path + '/images/spinner.gif') center center no-repeat;
background: url('#{$static-path}/images/spinner.gif') center center no-repeat;
}
&.correct, &.ui-icon-check {
@@ -656,7 +656,7 @@ section.open-ended-child {
top: 6px;
width: 25px;
height: 20px;
background: url($static-path + '/images/correct-icon.png') center center no-repeat;
background: url('#{$static-path}/images/correct-icon.png') center center no-repeat;
}
&.incorrect, &.ui-icon-close {
@@ -665,7 +665,7 @@ section.open-ended-child {
top: 6px;
width: 20px;
height: 20px;
background: url($static-path + '/images/incorrect-icon.png') center center no-repeat;
background: url('#{$static-path}/images/incorrect-icon.png') center center no-repeat;
}
}
@@ -703,7 +703,7 @@ section.open-ended-child {
.grading {
margin: 0 7px 0 0;
padding-left: 25px;
background: url($static-path + '/images/info-icon.png') left center no-repeat;
background: url('#{$static-path}/images/info-icon.png') left center no-repeat;
text-indent: 0;
}

2
common/lib/xmodule/xmodule/css/problem/edit.scss
View File

@@ -110,7 +110,7 @@
width: 26px;
height: 21px;
vertical-align: middle;
background: url($static-path + '/images/problem-editor-icons.png') no-repeat;
background: url('#{$static-path}/images/problem-editor-icons.png') no-repeat;
}
.problem-editor-icon.heading1 {

20
common/lib/xmodule/xmodule/css/video/display.scss
View File

@@ -280,7 +280,7 @@ div.video {
a.ui-slider-handle {
@extend %ui-fake-link;
@include transform(scale(.7, 1.3) translate3d(-80%, -15%, 0));
background: $pink url($static-path + '/images/slider-handle.png') center center no-repeat;
background: $pink url('#{$static-path}/images/slider-handle.png') center center no-repeat;
background-size: 50%;
border: 1px solid darken($pink, 20%);
border-radius: 50%;
@@ -314,7 +314,7 @@ div.video {
.video_control {
@extend %video-button;
float: left;
background-image: url($static-path + '/images/vcr.png');
background-image: url('#{$static-path}/images/vcr.png');
background-position: 15px 15px ;
background-repeat: no-repeat;
border-left: none;
@@ -445,7 +445,7 @@ div.video {
div.speeds {
&.is-opened {
.speed-button {
background-image: url($static-path + '/images/open-arrow.png');
background-image: url('#{$static-path}/images/open-arrow.png');
}
}
@@ -460,7 +460,7 @@ div.video {
.speed-button {
@extend %video-button;
@include clearfix();
background-image: url($static-path + '/images/closed-arrow.png');
background-image: url('#{$static-path}/images/closed-arrow.png');
background-position: 10px center;
background-repeat: no-repeat;
min-width: 116px;
@@ -515,14 +515,14 @@ div.video {
&.is-muted {
& > a {
background-image: url($static-path + '/images/mute.png');
background-image: url('#{$static-path}/images/mute.png');
}
}
& > a {
@extend %video-button;
@include clearfix();
background-image: url($static-path + '/images/volume.png');
background-image: url('#{$static-path}/images/volume.png');
background-position: 10px center;
background-repeat: no-repeat;
width: 30px;
@@ -559,7 +559,7 @@ div.video {
a.ui-slider-handle {
@extend %ui-fake-link;
@include transition(height $tmg-s2 ease-in-out 0s, width $tmg-s2 ease-in-out 0s);
background: $pink url($static-path + '/images/slider-handle.png') center center no-repeat;
background: $pink url('#{$static-path}/images/slider-handle.png') center center no-repeat;
background-size: 50%;
border: 1px solid darken($pink, 20%);
border-radius: 15px;
@@ -578,7 +578,7 @@ div.video {
a.add-fullscreen {
@extend %video-button;
background: url($static-path + '/images/fullscreen.png') center no-repeat;
background: url('#{$static-path}/images/fullscreen.png') center no-repeat;
border-left: none;
float: left;
padding: 0 11px;
@@ -588,7 +588,7 @@ div.video {
a.quality-control {
@extend %video-button;
background: url($static-path + '/images/hd.png') center no-repeat;
background: url('#{$static-path}/images/hd.png') center no-repeat;
border-left: none;
float: left;
padding: 0 11px;
@@ -610,7 +610,7 @@ div.video {
@extend %video-button;
@include transition(none);
box-shadow: inset 1px 0 0 #555;
background: url($static-path + '/images/cc.png') center no-repeat;
background: url('#{$static-path}/images/cc.png') center no-repeat;
border-left: none;
border-right: none;
padding: 0 11px;