Merge pull request #44 from dev-onenetworkecommerce/fix-vertical-rhythm

Bulk update.
dev-onenetworkecommerce · Sep 21, 2015 · 578e9c5 · 578e9c5
2 parents a600a67 + 55a9870
commit 578e9c5
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 42 deletions.
diff --git a/dist/aia.css b/dist/aia.css
diff --git a/dist/aia.css.map b/dist/aia.css.map
diff --git a/docs/dist/style.css b/docs/dist/style.css
diff --git a/styles/_main.scss b/styles/_main.scss
@@ -1,7 +1,7 @@
 @import "vendor/normalize";
+@import "colors";
 @import "variables";
 @import "utils";
-@import "colors";
 
 @import "base/type";
 @import "base/layout";

diff --git a/styles/_utils.scss b/styles/_utils.scss
@@ -35,6 +35,20 @@
 ._text-center { text-align: center !important; }
 ._text-right { text-align: right !important; }
 
+// Text color variants
+// for deprecations
+.text-sky { color: $brand-sky; }
+.text-crimson { color: $brand-crimson; }
+.text-emerald { color: $brand-emerald; }
+.text-sun { color: $brand-sun; }
+.text-muted { color: $brand-gray-dk; }
+// replacements for the above :D
+._text-sky { color: $brand-sky; }
+._text-crimson { color: $brand-crimson; }
+._text-emerald { color: $brand-emerald; }
+._text-sun { color: $brand-sun; }
+._text-muted { color: $brand-gray-dk; }
+
 // Center block
 .centered, // deprecating in the future
 ._centered { // stays

diff --git a/styles/base/type.scss b/styles/base/type.scss
@@ -8,7 +8,7 @@
   margin-bottom: ($medium / 2);
 }
 
-h1, h2, h3, h4, h5, h6
+h1, h2, h3, h4, h5, h6,
 p, blockquote {
   @include vertical-rhythm;
 }
@@ -35,12 +35,6 @@ a {
   }
 }
 
-.text-sky { color: $brand-sky; }
-.text-crimson { color: $brand-crimson; }
-.text-emerald { color: $brand-emerald; }
-.text-sun { color: $brand-sun; }
-.text-muted { color: $brand-gray-dk; }
-
 .lead {
   font-size: 20px;
   font-weight: 300;