Merge pull request #12 from 18F/jy-font-path

Fix fonts
18F · Sep 14, 2016 · 862e862 · 862e862
2 parents 307b29c + 6cbd86f
commit 862e862
Show file tree

Hide file tree

Showing 36 changed files with 5 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Then bundle and include the stylesheets in your manifest in this order:
 ```
 # app/assets/stylesheets/application.scss
 
+@import 'uswds_rails_overrides/core/defaults';
 @import 'uswds/all';
 @import 'uswds_rails_overrides/all';
 ```

diff --git a/app/assets/stylesheets/uswds_rails_overrides/all.scss b/app/assets/stylesheets/uswds_rails_overrides/all.scss
@@ -1,6 +1,6 @@
 // Core -------------- //
 
-@import 'core/fonts';
+@import 'core/defaults';
 
 // Elements -------------- //
 

diff --git a/app/assets/stylesheets/uswds_rails_overrides/core/_defaults.scss b/app/assets/stylesheets/uswds_rails_overrides/core/_defaults.scss
@@ -0,0 +1,3 @@
+// Typography
+$font-path:  'uswds';
+$asset-pipeine: true;
diff --git a/app/assets/stylesheets/uswds_rails_overrides/core/_fonts.scss b/app/assets/stylesheets/uswds_rails_overrides/core/_fonts.scss
diff --git a/...ssets/fonts/merriweather-bold-webfont.eot → ...fonts/uswds/merriweather-bold-webfont.eot b/...ssets/fonts/merriweather-bold-webfont.eot → ...fonts/uswds/merriweather-bold-webfont.eot
diff --git a/...ssets/fonts/merriweather-bold-webfont.ttf → ...fonts/uswds/merriweather-bold-webfont.ttf b/...ssets/fonts/merriweather-bold-webfont.ttf → ...fonts/uswds/merriweather-bold-webfont.ttf
diff --git a/...sets/fonts/merriweather-bold-webfont.woff → ...onts/uswds/merriweather-bold-webfont.woff b/...sets/fonts/merriweather-bold-webfont.woff → ...onts/uswds/merriweather-bold-webfont.woff
diff --git a/...ets/fonts/merriweather-bold-webfont.woff2 → ...nts/uswds/merriweather-bold-webfont.woff2 b/...ets/fonts/merriweather-bold-webfont.woff2 → ...nts/uswds/merriweather-bold-webfont.woff2
diff --git a/...ets/fonts/merriweather-italic-webfont.eot → ...nts/uswds/merriweather-italic-webfont.eot b/...ets/fonts/merriweather-italic-webfont.eot → ...nts/uswds/merriweather-italic-webfont.eot
diff --git a/...ets/fonts/merriweather-italic-webfont.ttf → ...nts/uswds/merriweather-italic-webfont.ttf b/...ets/fonts/merriweather-italic-webfont.ttf → ...nts/uswds/merriweather-italic-webfont.ttf
diff --git a/...ts/fonts/merriweather-italic-webfont.woff → ...ts/uswds/merriweather-italic-webfont.woff b/...ts/fonts/merriweather-italic-webfont.woff → ...ts/uswds/merriweather-italic-webfont.woff
diff --git a/...s/fonts/merriweather-italic-webfont.woff2 → ...s/uswds/merriweather-italic-webfont.woff2 b/...s/fonts/merriweather-italic-webfont.woff2 → ...s/uswds/merriweather-italic-webfont.woff2
diff --git a/...sets/fonts/merriweather-light-webfont.eot → ...onts/uswds/merriweather-light-webfont.eot b/...sets/fonts/merriweather-light-webfont.eot → ...onts/uswds/merriweather-light-webfont.eot
diff --git a/...sets/fonts/merriweather-light-webfont.ttf → ...onts/uswds/merriweather-light-webfont.ttf b/...sets/fonts/merriweather-light-webfont.ttf → ...onts/uswds/merriweather-light-webfont.ttf
diff --git a/...ets/fonts/merriweather-light-webfont.woff → ...nts/uswds/merriweather-light-webfont.woff b/...ets/fonts/merriweather-light-webfont.woff → ...nts/uswds/merriweather-light-webfont.woff
diff --git a/...ts/fonts/merriweather-light-webfont.woff2 → ...ts/uswds/merriweather-light-webfont.woff2 b/...ts/fonts/merriweather-light-webfont.woff2 → ...ts/uswds/merriweather-light-webfont.woff2
diff --git a/...ts/fonts/merriweather-regular-webfont.eot → ...ts/uswds/merriweather-regular-webfont.eot b/...ts/fonts/merriweather-regular-webfont.eot → ...ts/uswds/merriweather-regular-webfont.eot
diff --git a/...ts/fonts/merriweather-regular-webfont.ttf → ...ts/uswds/merriweather-regular-webfont.ttf b/...ts/fonts/merriweather-regular-webfont.ttf → ...ts/uswds/merriweather-regular-webfont.ttf
diff --git a/...s/fonts/merriweather-regular-webfont.woff → ...s/uswds/merriweather-regular-webfont.woff b/...s/fonts/merriweather-regular-webfont.woff → ...s/uswds/merriweather-regular-webfont.woff
diff --git a/.../fonts/merriweather-regular-webfont.woff2 → .../uswds/merriweather-regular-webfont.woff2 b/.../fonts/merriweather-regular-webfont.woff2 → .../uswds/merriweather-regular-webfont.woff2
diff --git a/...sets/fonts/sourcesanspro-bold-webfont.eot → ...onts/uswds/sourcesanspro-bold-webfont.eot b/...sets/fonts/sourcesanspro-bold-webfont.eot → ...onts/uswds/sourcesanspro-bold-webfont.eot
diff --git a/...sets/fonts/sourcesanspro-bold-webfont.ttf → ...onts/uswds/sourcesanspro-bold-webfont.ttf b/...sets/fonts/sourcesanspro-bold-webfont.ttf → ...onts/uswds/sourcesanspro-bold-webfont.ttf
diff --git a/...ets/fonts/sourcesanspro-bold-webfont.woff → ...nts/uswds/sourcesanspro-bold-webfont.woff b/...ets/fonts/sourcesanspro-bold-webfont.woff → ...nts/uswds/sourcesanspro-bold-webfont.woff
diff --git a/...ts/fonts/sourcesanspro-bold-webfont.woff2 → ...ts/uswds/sourcesanspro-bold-webfont.woff2 b/...ts/fonts/sourcesanspro-bold-webfont.woff2 → ...ts/uswds/sourcesanspro-bold-webfont.woff2
diff --git a/...ts/fonts/sourcesanspro-italic-webfont.eot → ...ts/uswds/sourcesanspro-italic-webfont.eot b/...ts/fonts/sourcesanspro-italic-webfont.eot → ...ts/uswds/sourcesanspro-italic-webfont.eot
diff --git a/...ts/fonts/sourcesanspro-italic-webfont.ttf → ...ts/uswds/sourcesanspro-italic-webfont.ttf b/...ts/fonts/sourcesanspro-italic-webfont.ttf → ...ts/uswds/sourcesanspro-italic-webfont.ttf
diff --git a/...s/fonts/sourcesanspro-italic-webfont.woff → ...s/uswds/sourcesanspro-italic-webfont.woff b/...s/fonts/sourcesanspro-italic-webfont.woff → ...s/uswds/sourcesanspro-italic-webfont.woff
diff --git a/.../fonts/sourcesanspro-italic-webfont.woff2 → .../uswds/sourcesanspro-italic-webfont.woff2 b/.../fonts/sourcesanspro-italic-webfont.woff2 → .../uswds/sourcesanspro-italic-webfont.woff2
diff --git a/...ets/fonts/sourcesanspro-light-webfont.eot → ...nts/uswds/sourcesanspro-light-webfont.eot b/...ets/fonts/sourcesanspro-light-webfont.eot → ...nts/uswds/sourcesanspro-light-webfont.eot
diff --git a/...ets/fonts/sourcesanspro-light-webfont.ttf → ...nts/uswds/sourcesanspro-light-webfont.ttf b/...ets/fonts/sourcesanspro-light-webfont.ttf → ...nts/uswds/sourcesanspro-light-webfont.ttf
diff --git a/...ts/fonts/sourcesanspro-light-webfont.woff → ...ts/uswds/sourcesanspro-light-webfont.woff b/...ts/fonts/sourcesanspro-light-webfont.woff → ...ts/uswds/sourcesanspro-light-webfont.woff
diff --git a/...s/fonts/sourcesanspro-light-webfont.woff2 → ...s/uswds/sourcesanspro-light-webfont.woff2 b/...s/fonts/sourcesanspro-light-webfont.woff2 → ...s/uswds/sourcesanspro-light-webfont.woff2
diff --git a/...s/fonts/sourcesanspro-regular-webfont.eot → ...s/uswds/sourcesanspro-regular-webfont.eot b/...s/fonts/sourcesanspro-regular-webfont.eot → ...s/uswds/sourcesanspro-regular-webfont.eot
diff --git a/...s/fonts/sourcesanspro-regular-webfont.ttf → ...s/uswds/sourcesanspro-regular-webfont.ttf b/...s/fonts/sourcesanspro-regular-webfont.ttf → ...s/uswds/sourcesanspro-regular-webfont.ttf
diff --git a/.../fonts/sourcesanspro-regular-webfont.woff → .../uswds/sourcesanspro-regular-webfont.woff b/.../fonts/sourcesanspro-regular-webfont.woff → .../uswds/sourcesanspro-regular-webfont.woff
diff --git a/...fonts/sourcesanspro-regular-webfont.woff2 → ...uswds/sourcesanspro-regular-webfont.woff2 b/...fonts/sourcesanspro-regular-webfont.woff2 → ...uswds/sourcesanspro-regular-webfont.woff2