From d191110f62106d76f7c80f0ed1baa135b4286d0e Mon Sep 17 00:00:00 2001
From: "Dan O. Williams" <daniel.williams@gsa.gov>
Date: Sun, 7 Oct 2018 14:00:15 -0700
Subject: [PATCH] Add theme imports directly into styles.scss

---
 src/stylesheets/theme/_uswds-theme.scss | 18 ------------------
 src/stylesheets/theme/styles.scss       | 21 ++++++++-------------
 2 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 src/stylesheets/theme/_uswds-theme.scss

diff --git a/src/stylesheets/theme/_uswds-theme.scss b/src/stylesheets/theme/_uswds-theme.scss
deleted file mode 100644
index f550e11b2e..0000000000
--- a/src/stylesheets/theme/_uswds-theme.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-* * * * * ==============================
-* * * * * ==============================
-* * * * * ==============================
-* * * * * ==============================
-========================================
-========================================
-========================================
-----------------------------------------
-USWDS THEME SETTINGS
-----------------------------------------
-*/
-
-@import 'uswds-theme-general';
-@import 'uswds-theme-typography';
-@import 'uswds-theme-spacing';
-@import 'uswds-theme-color';
-@import 'uswds-theme-utilities';
diff --git a/src/stylesheets/theme/styles.scss b/src/stylesheets/theme/styles.scss
index 183230db8e..402998c574 100644
--- a/src/stylesheets/theme/styles.scss
+++ b/src/stylesheets/theme/styles.scss
@@ -9,21 +9,16 @@
 */
 
 // -------------------------------------
-// import individual theme settings...
+// Import individual theme settings
 
-// @import 'uswds-theme-general';
-// @import 'uswds-theme-typography';
-// @import 'uswds-theme-spacing';
-// @import 'uswds-theme-color';
-// @import 'uswds-theme-utilities';
+@import 'uswds-theme-general';
+@import 'uswds-theme-typography';
+@import 'uswds-theme-spacing';
+@import 'uswds-theme-color';
+@import 'uswds-theme-utilities';
 
 // -------------------------------------
-// ...or import all theme settings
-
-@import 'uswds-theme';
-
-// -------------------------------------
-// import individual USWDS modules...
+// Import individual USWDS modules...
 
 // @import 'uswds-fonts';
 // @import 'uswds-layout-grid';
@@ -36,6 +31,6 @@
 @import 'uswds';
 
 // -------------------------------------
-// import theme custom styles
+// Import theme custom styles
 
 @import 'uswds-theme-custom-styles';