Merge pull request #461 from montalvomiguelo/echo-setting-logo_max_width

Using the settings.logo_max_width value in styles
Shopify · Sep 17, 2015 · a3ddf4c · a3ddf4c
2 parents d75393f + 15dc440
commit a3ddf4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/assets/timber.scss.liquid b/assets/timber.scss.liquid
@@ -113,6 +113,9 @@ $colorNavText: #333;
 $colorFooterBg: {{ settings.color_footer_bg }};
 $colorFooterText: {{ settings.color_footer_text }};
 
+// Logo max width
+$logoMaxWidth: {{ settings.logo_max_width | default: '450' | remove: 'px' }}px;
+
 // Helper colors
 $disabledGrey: #f6f6f6;
 $disabledBorder: darken($disabledGrey, 25%);
@@ -1799,7 +1802,7 @@ label.error {
 }
 
 .site-header__logo-link {
-  max-width: 450px; // max upload size
+  max-width: $logoMaxWidth;
   margin: 0 auto;
 }
 

diff --git a/config/settings_schema.json b/config/settings_schema.json
@@ -117,7 +117,7 @@
         "id": "logo_max_width",
         "label": "Max Logo Width",
         "default": "450",
-        "info": "Defines the CSS max-width."
+        "info": "Defined in pixels. Do not add the 'px' unit."
       },
       {
         "type": "header",