Merge pull request #282 from edx/andya/fix-asset-loading

andy-armstrong · andy-armstrong · commit 35730481d649 · 2016-02-01T10:04:49.000-05:00
Fix path loading issues when consuming the Pattern Library
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ Nothing yet
 
 - - -
 
+## 0.9.1 (2016-02-01)
+* introduce $pattern-library-path variable
+* FIX - always refer to edx-icons via $edx-icons-font-path
+
+- - -
+
 ## 0.9 (2016-02-01)
 * adding tables pattern - for use in content and sortable table listings
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-pattern-library",
-  "version": "0.9",
+  "version": "0.9.1",
   "authors": [
     "edX UX Team <ux@edx.org>"
   ],
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-pattern-library",
-  "version": "0.9",
+  "version": "0.9.1",
   "author": "edX UX Team <ux@edx.org>",
   "license": "Apache-2.0",
   "description": "The (working) Visual, UI, and Front End Styleguide for edX Apps",
diff --git a/pattern-library/sass/global/_settings.scss b/pattern-library/sass/global/_settings.scss
@@ -17,9 +17,9 @@
 // ----------------------------
 // #PATHS
 // ----------------------------
-$font-path: '../fonts' !default;
-$image-path: '../images' !default;
-
+$pattern-library-path: '..' !default;
+$font-path: '#{$pattern-library-path}/fonts' !default;
+$image-path: '#{$pattern-library-path}/images' !default;
 
 // ----------------------------
 // #UNITS
diff --git a/pattern-library/sass/patterns/_icons.scss b/pattern-library/sass/patterns/_icons.scss
@@ -494,6 +494,6 @@ cc;
 
 @each $edx-icon in $edx-icons {
     .icon-fallback-img .icon-#{$edx-icon} {
-    background: url('../fonts/edx-icons/fallback-img/#{$edx-icon}.svg') center center no-repeat;
+    background: url('#{$edx-icons-font-path}/fallback-img/#{$edx-icon}.svg') center center no-repeat;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "edx-pattern-library",`
`3`		`- "version": "0.9",`
	`3`	`+ "version": "0.9.1",`
`4`	`4`	`"authors": [`
`5`	`5`	`"edX UX Team <[email protected]>"`
`6`	`6`	`],`
Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,6 @@ cc;`
`494`	`494`
`495`	`495`	`@each $edx-icon in $edx-icons {`
`496`	`496`	`.icon-fallback-img .icon-#{$edx-icon} {`
`497`		`- background: url('../fonts/edx-icons/fallback-img/#{$edx-icon}.svg') center center no-repeat;`
	`497`	`+ background: url('#{$edx-icons-font-path}/fallback-img/#{$edx-icon}.svg') center center no-repeat;`
`498`	`498`	`}`
`499`	`499`	`}`