[Frontend] Merge old open1233a into latest master

Fixes #1233
2017-01-27 15:39:18 -08:00
parent 3ae0fd7bc9
commit 77396093d8
12 changed files with 341 additions and 19 deletions
--- a/platform/commonUI/general/res/sass/_text.scss
+++ b/platform/commonUI/general/res/sass/_text.scss
@@ -37,20 +37,6 @@
 	}

 	h1, h2, h3 {
-		color: pullForward($colorBodyFg, 20%);
-		font-weight: normal !important;
-		margin-bottom: 1em;
-	}
-
-	h2 {
-		border-top: 1px solid $colorInteriorBorder;
-		font-size: 1.5em;
-		margin-top: 2em;
-		padding-top: 1em;
-	}
-
-	h3 {
-		margin-top: 2em;
-	}
-
+        font-weight: 200 !important;
+    }
 }