Merge pull request #3120 from uswds/dw-add-bc-hero-var

Add backward compatible default to $theme-hero-image
uswds · Sep 25, 2019 · e46fea5 · e46fea5
2 parents 50b711a + fd91e9e
commit e46fea5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/stylesheets/packages/_required.scss b/src/stylesheets/packages/_required.scss
@@ -5,6 +5,8 @@
 @import '../settings/settings-color';
 @import '../settings/settings-spacing';
 @import '../settings/settings-utilities';
+
+// components import needs to be last
 @import '../settings/settings-components';
 
 @import '../core/functions';

diff --git a/src/stylesheets/settings/_settings-components.scss b/src/stylesheets/settings/_settings-components.scss
@@ -57,7 +57,7 @@ $theme-header-max-width:              'desktop' !default;
 $theme-header-min-width:              'desktop' !default;
 
 // Hero
-$theme-hero-image:                    '../img/hero.png' !default;
+$theme-hero-image:                    '#{$theme-image-path}/hero.png' !default;
 
 // Navigation
 $theme-navigation-font-family:        'ui' !default;

diff --git a/src/stylesheets/theme/_uswds-theme-components.scss b/src/stylesheets/theme/_uswds-theme-components.scss
@@ -57,7 +57,7 @@ $theme-header-max-width:              'desktop';
 $theme-header-min-width:              'desktop';
 
 // Hero
-$theme-hero-image:                    '../img/hero.png';
+$theme-hero-image:                    '#{$theme-image-path}/hero.png';
 
 // Navigation
 $theme-navigation-font-family:        'ui';

diff --git a/src/stylesheets/theme/styles.scss b/src/stylesheets/theme/styles.scss
@@ -13,11 +13,13 @@
 
 @import 'uswds-theme-general';
 @import 'uswds-theme-typography';
-@import 'uswds-theme-components';
 @import 'uswds-theme-spacing';
 @import 'uswds-theme-color';
 @import 'uswds-theme-utilities';
 
+// components import needs to be last
+@import 'uswds-theme-components';
+
 // -------------------------------------
 // Import individual USWDS packages...
 // See https://designsystem.digital.gov/components/