Skip to content

E
edx-platform
Commit c0856232 by Ned Batchelder Committed by David Baumgold
Options

Use sass interpolation instead of concatenation for -path

parent 5d64f9a8
Showing with 156 additions and 156 deletions
cms/static/sass/assets/_fonts.scss
......@@ -3,9 +3,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
......@@ -13,9 +13,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
......@@ -23,9 +23,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
......@@ -33,9 +33,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
......@@ -43,9 +43,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
......@@ -53,9 +53,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
......@@ -63,9 +63,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
......@@ -73,9 +73,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
cms/static/sass/assets/_graphics.scss
......@@ -7,7 +7,7 @@
width: 7px;
height: 22px;
margin-left: ($baseline/2);
background: url($static-path + '/images/drag-handles.png') no-repeat;
background: url('#{$static-path}/images/drag-handles.png') no-repeat;
cursor: move;
}
......@@ -15,33 +15,33 @@
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url($static-path + '/images/large-advanced-icon.png') center no-repeat;
background: url('#{$static-path}/images/large-advanced-icon.png') center no-repeat;
}
.large-discussion-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url($static-path + '/images/large-discussion-icon.png') center no-repeat;
background: url('#{$static-path}/images/large-discussion-icon.png') center no-repeat;
}
.large-html-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url($static-path + '/images/large-html-icon.png') center no-repeat;
background: url('#{$static-path}/images/large-html-icon.png') center no-repeat;
}
.large-problem-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url($static-path + '/images/large-problem-icon.png') center no-repeat;
background: url('#{$static-path}/images/large-problem-icon.png') center no-repeat;
}
.large-video-icon {
display: inline-block;
width: ($baseline*3);
height: ($baseline*3);
background: url($static-path + '/images/large-video-icon.png') center no-repeat;
background: url('#{$static-path}/images/large-video-icon.png') center no-repeat;
}
cms/static/sass/elements/_controls.scss
......@@ -295,12 +295,12 @@
// CASE: right to left layout
@include rtl {
background: transparent url($static-path + "/images/drag-handles.png") no-repeat left center;
background: transparent url("#{$static-path}/images/drag-handles.png") no-repeat left center;
}
// CASE: left to right layout
@include ltr {
background: transparent url($static-path + "/images/drag-handles.png") no-repeat right center;
background: transparent url("#{$static-path}/images/drag-handles.png") no-repeat right center;
}
}
......
cms/static/sass/elements/_creative-commons.scss
@font-face {
font-family: 'CreativeCommons';
src: url($static-path + '/fonts/CreativeCommons/cc.eot');
src: url($static-path + '/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url($static-path + '/fonts/CreativeCommons/cc.woff') format('woff'),
url($static-path + '/fonts/CreativeCommons/cc.ttf') format('truetype'),
url($static-path + '/fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot');
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url('#{$static-path}/fonts/CreativeCommons/cc.woff') format('woff'),
url('#{$static-path}/fonts/CreativeCommons/cc.ttf') format('truetype'),
url('#{$static-path}/fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
font-weight: normal;
font-style: normal;
}
......
cms/static/sass/elements/_forms.scss
......@@ -456,7 +456,7 @@ input.search {
@include box-sizing(border-box);
border: 1px solid $darkGrey;
border-radius: 20px;
background: url($static-path + '/images/search-icon.png') no-repeat 8px 7px #edf1f5;
background: url('#{$static-path}/images/search-icon.png') no-repeat 8px 7px #edf1f5;
font-family: 'Open Sans', sans-serif;
color: $baseFontColor;
outline: 0;
......
cms/static/sass/elements/_uploaded-assets.scss
......@@ -100,7 +100,7 @@
}
&.is-locked {
background-image: url($static-path + '/images/bg-micro-stripes.png');
background-image: url('#{$static-path}/images/bg-micro-stripes.png');
background-position: 0 0;
background-repeat: repeat;
}
......
cms/static/sass/views/_assets.scss
......@@ -299,7 +299,7 @@
}
&.is-locked {
background-image: url($static-path + '/images/bg-micro-stripes.png');
background-image: url('#{$static-path}/images/bg-micro-stripes.png');
background-position: 0 0;
background-repeat: repeat;
}
......
cms/static/sass/views/_static-pages.scss
......@@ -197,7 +197,7 @@
}
.drag-handle {
background: url($static-path + '/images/drag-handles.png') center no-repeat #fff;
background: url('#{$static-path}/images/drag-handles.png') center no-repeat #fff;
}
}
......@@ -210,10 +210,10 @@
width: 35px;
height: 100%;
border: none;
background: url($static-path + '/images/drag-handles.png') center no-repeat #fff;
background: url('#{$static-path}/images/drag-handles.png') center no-repeat #fff;
&:hover {
background: url($static-path + '/images/drag-handles.png') center no-repeat #fff;
background: url('#{$static-path}/images/drag-handles.png') center no-repeat #fff;
}
&.is-fixed {
......
common/lib/xmodule/xmodule/css/capa/display.scss
......@@ -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 {
......
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
......@@ -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;
}
......
common/lib/xmodule/xmodule/css/problem/edit.scss
......@@ -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 {
......
common/lib/xmodule/xmodule/css/video/display.scss
......@@ -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;
......
lms/static/certificates/sass/_components.scss
......@@ -494,7 +494,7 @@
}
.accomplishment-rendering {
background: palette(grayscale, white-t) url($static-path + '/images/bg-distinguished.png') center no-repeat;
background: palette(grayscale, white-t) url('#{$static-path}/images/bg-distinguished.png') center no-repeat;
background-size: 65%;
.deco-corner-tl {
......
lms/static/sass/base/_base.scss
......@@ -179,7 +179,7 @@ span.edx {
width: 20px;
height: 20px;
margin-left: -($baseline/2);
background: url($static-path + '/images/spinner.gif') no-repeat;
background: url('#{$static-path}/images/spinner.gif') no-repeat;
}
mark {
......@@ -205,7 +205,7 @@ mark {
width: 27px;
height: 24px;
margin-right: ($baseline*0.75);
background: url($static-path + '/images/large-white-error-icon.png') no-repeat;
background: url('#{$static-path}/images/large-white-error-icon.png') no-repeat;
}
.inner-wrapper {
......
lms/static/sass/base/_font_face.scss
......@@ -3,9 +3,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
......@@ -13,9 +13,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-LightItalic-webfont.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}
......@@ -23,9 +23,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Regular-webfont.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
......@@ -33,9 +33,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Italic-webfont.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
......@@ -43,9 +43,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Semibold-webfont.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
......@@ -53,9 +53,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
......@@ -63,9 +63,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-Bold-webfont.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
......@@ -73,9 +73,9 @@
@font-face {
font-family: 'Open Sans';
src:
url($static-path + '/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url($static-path + '/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url($static-path + '/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff2') format('woff2'),
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.woff') format('woff'),
url('#{$static-path}/fonts/OpenSans/OpenSans-BoldItalic-webfont.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
lms/static/sass/base/_variables.scss
......@@ -447,13 +447,13 @@ $dashboard-course-cover-border: $light-gray;
// MISC: course assets
$content-wrapper-bg: $white !default;
$course-bg-color: #f2f2f2;
$course-bg-image: url($static-path + '/images/bg-texture.png');
$course-bg-image: url('#{$static-path}/images/bg-texture.png');
$account-content-wrapper-bg: shade($body-bg, 2%);
$course-profile-bg: rgb(245,245,245);
$course-header-bg: rgba(255,255,255, 0.93);
// MISC: course background texture
//$course-bg-image: url($static-path + '/images/bg-texture.png');
//$course-bg-image: url('#{$static-path}/images/bg-texture.png');
// MISC: borders
$border-color-1: rgb(190,190,190);
......@@ -508,11 +508,11 @@ $course-title-height: ($baseline*3.6);
// IMAGES: backgrounds
$homepage-bg-image: none;
$login-banner-image: url($static-path + '/images/edx-theme/edx-background-banner-account.png');
$register-banner-image: url($static-path + '/images/edx-theme/edx-background-banner-account.png');
$passwordreset-banner-image: url($static-path + '/images/edx-theme/edx-background-banner-account.png');
$login-banner-image: url('#{$static-path}/images/edx-theme/edx-background-banner-account.png');
$register-banner-image: url('#{$static-path}/images/edx-theme/edx-background-banner-account.png');
$passwordreset-banner-image: url('#{$static-path}/images/edx-theme/edx-background-banner-account.png');
$video-thumb-url: $static-path + '/images/homepage-hero-video-thumb.jpg';
$video-thumb-url: '#{$static-path}/images/homepage-hero-video-thumb.jpg';
// ====================
......
lms/static/sass/course/_gradebook.scss
......@@ -20,7 +20,7 @@ div.gradebook-wrapper {
@include box-sizing(border-box);
border-radius: 13px;
border: 1px solid $table-border-color;
background: url($static-path + '/images/search-icon.png') no-repeat 9px center $gray-l6;
background: url('#{$static-path}/images/search-icon.png') no-repeat 9px center $gray-l6;
font-family: $sans-serif;
font-size: 11px;
box-shadow: 0 1px 4px rgba(0, 0, 0, .12) inset;
......
lms/static/sass/course/_info.scss
......@@ -33,7 +33,7 @@ div.info-wrapper {
h2 {
font-size: $body-font-size;
font-weight: bold;
background: url($static-path + '/images/calendar-icon.png') 0 center no-repeat;
background: url('#{$static-path}/images/calendar-icon.png') 0 center no-repeat;
padding-left: $baseline;
}
......@@ -183,7 +183,7 @@ div.info-wrapper {
}
div.hitarea {
background-image: url($static-path + '/images/treeview-default.gif') no-repeat;
background-image: url('#{$static-path}/images/treeview-default.gif') no-repeat;
display: block;
height: 100%;
margin-left: 0;
......
lms/static/sass/course/_textbook.scss
......@@ -72,7 +72,7 @@ div.book-wrapper {
}
div.hitarea {
background-image: url($static-path + '/images/treeview-default.gif');
background-image: url('#{$static-path}/images/treeview-default.gif');
position: relative;
top: 4px;
......@@ -150,7 +150,7 @@ div.book-wrapper {
left: 0;
a {
background-image: url($static-path + '/images/textbook/textbook-left.png');
background-image: url('#{$static-path}/images/textbook/textbook-left.png');
}
}
......@@ -158,7 +158,7 @@ div.book-wrapper {
right: 0;
a {
background-image: url($static-path + '/images/textbook/textbook-right.png');
background-image: url('#{$static-path}/images/textbook/textbook-right.png');
}
}
......@@ -207,7 +207,7 @@ div.book-wrapper {
padding: 0;
a {
background-image: url($static-path + '/images/slide-right-icon.png');
background-image: url('#{$static-path}/images/slide-right-icon.png');
}
h2 {
......
lms/static/sass/course/base/_extends.scss
......@@ -152,7 +152,7 @@ h1.top-header {
position: relative;
a {
background: #f6f6f6 url($static-path + '/images/slide-left-icon.png') center center no-repeat;
background: #f6f6f6 url('#{$static-path}/images/slide-left-icon.png') center center no-repeat;
border: 1px solid #D3D3D3;
border-radius: 3px 0 0 3px;
height: 16px;
......
lms/static/sass/course/courseware/_amplifier.scss
......@@ -231,7 +231,7 @@ section.tool-wrapper {
}
.ui-slider-handle {
background: lighten( #586e75, 5% ) url($static-path + '/images/amplifier-slider-handle.png') center no-repeat;
background: lighten( #586e75, 5% ) url('#{$static-path}/images/amplifier-slider-handle.png') center no-repeat;
border: 1px solid darken(#002b36, 8%);
box-shadow: inset 0 1px 0 lighten( #586e75, 20% );
margin-top: -.3em;
......
lms/static/sass/course/courseware/_courseware.scss
......@@ -667,7 +667,7 @@ div.course-wrapper {
header#open_close_accordion {
a {
background-image: url($static-path + '/images/slide-right-icon.png');
background-image: url('#{$static-path}/images/slide-right-icon.png');
}
}
......
lms/static/sass/course/discussion/_form-wmd-toolbar.scss
......@@ -52,7 +52,7 @@
margin-left: ($baseline/4);
margin-right: ($baseline/4);
position: absolute;
background-image: url($static-path + '/images/wmd-buttons.png');
background-image: url('#{$static-path}/images/wmd-buttons.png');
background-repeat: no-repeat;
background-position: 0px 0px;
display: inline-block;
......
lms/static/sass/course/modules/_calculator.scss
......@@ -17,7 +17,7 @@
.calc {
@include transition(background-color $tmg-f2 ease-in-out 0s);
background: url($static-path + "/images/calc-icon.png") $black-t1 no-repeat center;
background: url("#{$static-path}/images/calc-icon.png") $black-t1 no-repeat center;
border-bottom: 0;
color: $white;
float: right;
......@@ -33,7 +33,7 @@
}
&.closed {
background-image: url($static-path + "/images/close-calc-icon.png");
background-image: url("#{$static-path}/images/close-calc-icon.png");
background-color: $black;
top: -36px;
}
......@@ -155,7 +155,7 @@
height: 35px;
width: 35px;
border: none;
background: url($static-path + "/images/info-icon.png") center center no-repeat;
background: url("#{$static-path}/images/info-icon.png") center center no-repeat;
color: $white;
&:focus {
......
lms/static/sass/course/wiki/_wiki.scss
......@@ -100,7 +100,7 @@ section.wiki {
width: 180px;
height: 27px;
padding: 0 15px 0 35px;
background: url($static-path + '/images/search-icon.png') no-repeat 9px center $gray-l6;
background: url('#{$static-path}/images/search-icon.png') no-repeat 9px center $gray-l6;
border: 1px solid #c8c8c8;
border-radius: 14px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12) inset;
......
lms/static/sass/discussion/_discussion.scss
......@@ -417,7 +417,7 @@ body.discussion {
.discussion-article {
position: relative;
min-height: 500px;
background-image: url($static-path + '/images/bg-texture.png');
background-image: url('#{$static-path}/images/bg-texture.png');
a {
word-wrap: break-word;
......@@ -598,7 +598,7 @@ body.discussion {
background: transparent;
span {
background-image: url($static-path + '/images/wmd-buttons-transparent.png');
background-image: url('#{$static-path}/images/wmd-buttons-transparent.png');
}
}
}
......@@ -720,7 +720,7 @@ body.discussion {
}
.loading-animation {
background-image: url($static-path + '/images/spinner.gif');
background-image: url('#{$static-path}/images/spinner.gif');
}
.discussion-show {
......@@ -742,7 +742,7 @@ body.discussion {
@include margin-right(6px);
width: 21px;
height: 19px;
background: url($static-path + '/images/show-hide-discussion-icon.png') no-repeat;
background: url('#{$static-path}/images/show-hide-discussion-icon.png') no-repeat;
background-position: -21px 0;
}
}
......
lms/static/sass/discussion/views/_create-edit-post.scss
......@@ -188,7 +188,7 @@
.post-error {
padding: ($baseline/2) $baseline 12px 45px;
border-bottom: 1px solid $red;
background: url($static-path + '/images/white-error-icon.png') no-repeat 15px 14px;
background: url('#{$static-path}/images/white-error-icon.png') no-repeat 15px 14px;
&:last-child {
border-bottom: none;
......
lms/static/sass/elements/_creative-commons.scss
@font-face {
font-family: 'CreativeCommons';
src: url($static-path + '/fonts/CreativeCommons/cc.eot');
src: url($static-path + '/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url($static-path + '/fonts/CreativeCommons/cc.woff') format('woff'),
url($static-path + '/fonts/CreativeCommons/cc.ttf') format('truetype'),
url($static-path + '/fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot');
src: url('#{$static-path}/fonts/CreativeCommons/cc.eot#iefix') format('embedded-opentype'),
url('#{$static-path}/fonts/CreativeCommons/cc.woff') format('woff'),
url('#{$static-path}/fonts/CreativeCommons/cc.ttf') format('truetype'),
url('#{$static-path}/fonts/CreativeCommons/cc.svg#CreativeCommons') format('svg');
font-weight: normal;
font-style: normal;
}
......
lms/static/sass/multicourse/_course_about.scss
......@@ -405,7 +405,7 @@
.opencourseware {
text-indent: -9999px;
background: url($static-path + '/images/opencourseware.png') 0 0 no-repeat;
background: url('#{$static-path}/images/opencourseware.png') 0 0 no-repeat;
width: 266px;
height: 31px;
margin-bottom: $baseline;
......@@ -419,7 +419,7 @@
li {
list-style: none;
padding-left: 29px;
background: url($static-path + '/images/link-icon.png') left center no-repeat;
background: url('#{$static-path}/images/link-icon.png') left center no-repeat;
}
}
}
......
lms/static/sass/multicourse/_edge.scss
......@@ -175,7 +175,7 @@ $paleYellow: #fffcf1;
width: 263px;
height: 72px;
margin: 150px auto 50px;
background: url($static-path + '/images/edx-theme/edx-edge-logo-large.png') no-repeat;
background: url('#{$static-path}/images/edx-theme/edx-edge-logo-large.png') no-repeat;
text-indent: -9999px;
overflow: hidden;
}
......
lms/static/sass/views/_verification.scss
......@@ -1311,7 +1311,7 @@
display: block;
width: 45px;
height: 45px;
background: transparent url($static-path + '/images/verified-ribbon.png') no-repeat 0 0;
background: transparent url('#{$static-path}/images/verified-ribbon.png') no-repeat 0 0;
}
.action-intro, .action-select {
......
static/pattern-library/sass/utilities/_variables.scss
......@@ -135,52 +135,52 @@ $palettes: (
// typography: config
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-Light-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-Light-webfont',
300,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-LightItalic-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-LightItalic-webfont',
300,
italic,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-Regular-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-Regular-webfont',
400,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-Italic-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-Italic-webfont',
400,
italic,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-Semibold-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-Semibold-webfont',
600,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-SemiboldItalic-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-SemiboldItalic-webfont',
600,
italic,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-Bold-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-Bold-webfont',
700,
$file-formats: woff woff2 ttf
);
@include font-face(
'Open Sans',
$static-path + '/../fonts/OpenSans/OpenSans-BoldItalic-webfont',
'#{$static-path}/../fonts/OpenSans/OpenSans-BoldItalic-webfont',
700,
italic,
$file-formats: woff woff2 ttf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment