Use image_url() when creating the $logo_url variable

projectblacklight · Nov 3, 2016 · 9d7a926 · 9d7a926
1 parent acf1bcc
commit 9d7a926
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/assets/stylesheets/blacklight/_header.scss b/app/assets/stylesheets/blacklight/_header.scss
@@ -3,7 +3,15 @@
 */
 
 .navbar-brand {  /* The main logo image for the Blacklight instance */
-  background:transparent image_url($logo_image) no-repeat top left;
+  @if $logo_image {
+    // deprecated
+    background: transparent image_url($logo_image) no-repeat top left;
+  }
+
+  @if $logo-image {
+    background: transparent $logo-image no-repeat top left;
+  }
+
   display: inline-block;
   height: 50px;
   margin-right:20px;

diff --git a/app/assets/stylesheets/blacklight/blacklight_defaults.scss b/app/assets/stylesheets/blacklight/blacklight_defaults.scss
@@ -1,6 +1,7 @@
 /* Warning! If you want to change these, just copy them into your own theme css. But you want to remove the !default, which only will set them if not already set. */
 
-$logo_image: 'blacklight/logo.png' !default;
+$logo-image: image_url('blacklight/logo.png') !default;
+$logo_image: false !default; // deprecated
 
 /* label (field names) */
 $field_name_color: $text-muted !default;