Merge pull request #234 from alphagov/fix-path-for-rails-and-node-env…

…ironments Fix path for rails and node environments
alphagov · May 23, 2016 · 07b775e · 07b775e
2 parents 3b0eab4 + ab04a06
commit 07b775e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/public/sass/_govuk-elements.scss b/public/sass/_govuk-elements.scss
@@ -20,7 +20,7 @@
 @import "design-patterns/breadcrumbs";
 
 // Functions
-// @import "url-helpers";                         // Function to output image-url, or prefixed path (Rails and Compass only)
+@import "url-helpers";                            // Function to output image-url, or prefixed path (Rails and Compass only)
 
 // GOV.UK elements
 

diff --git a/public/sass/elements/_helpers.scss b/public/sass/elements/_helpers.scss
@@ -1,8 +1,9 @@
 // Helpers
 // ==========================================================================
 
-// Path to assets for use with file-url() is not already defined
-@if ($path == false) {
+// If image-url is not defined (if we are not in a Rails environment)
+// Set a path to /public/images
+@if not(function-exists(image-url)) {
   $path: "/public/images/";
 }