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

2
lms/static/certificates/sass/_components.scss
View File

@@ -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 {

4
lms/static/sass/base/_base.scss
View File

@@ -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 {

48
lms/static/sass/base/_font_face.scss
View File

@@ -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;
}

12
lms/static/sass/base/_variables.scss
View File

@@ -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';
// ====================

2
lms/static/sass/course/_gradebook.scss
View File

@@ -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;

4
lms/static/sass/course/_info.scss
View File

@@ -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;

8
lms/static/sass/course/_textbook.scss
View File

@@ -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 {

2
lms/static/sass/course/base/_extends.scss
View File

@@ -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;

2
lms/static/sass/course/courseware/_amplifier.scss
View File

@@ -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;

2
lms/static/sass/course/courseware/_courseware.scss
View File

@@ -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');
}
}

2
lms/static/sass/course/discussion/_form-wmd-toolbar.scss
View File

@@ -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;

6
lms/static/sass/course/modules/_calculator.scss
View File

@@ -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 {

2
lms/static/sass/course/wiki/_wiki.scss
View File

@@ -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;

8
lms/static/sass/discussion/_discussion.scss
View File

@@ -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;
}
}

2
lms/static/sass/discussion/views/_create-edit-post.scss
View File

@@ -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;

10
lms/static/sass/elements/_creative-commons.scss
View File

@@ -1,10 +1,10 @@
@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;
}

4
lms/static/sass/multicourse/_course_about.scss
View File

@@ -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;
}
}
}

2
lms/static/sass/multicourse/_edge.scss
View File

@@ -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;
}

2
lms/static/sass/views/_verification.scss
View File

@@ -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 {