Merge pull request #135 from BrightspaceUI/remove-label-responsivenes…

…s-hybrid Remove label responsiveness hybrid
BrightspaceUI · May 24, 2019 · 2afc577 · 2afc577
2 parents c5f9b42 + 44f4049
commit 2afc577
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/d2l-typography.html b/d2l-typography.html
@@ -134,10 +134,6 @@
 					font-size: 0.6rem;
 					line-height: 0.9rem;
 				}
-				.d2l-typography .d2l-label-text {
-					font-size: 0.6rem;
-					line-height: 0.9rem;
-				}
 			}
 
 		</style>

diff --git a/d2l-typography.scss b/d2l-typography.scss
@@ -166,10 +166,4 @@
 	line-height: 1rem;
 	font-weight: 700;
 	letter-spacing: 0.2px;
-	@media (max-width: 615px) {
-		font-size: 0.6rem;
-		line-height: 0.9rem;
-		font-weight: 700;
-		letter-spacing: 0.2px;
-	}
 }
diff --git a/test/acceptance/typography.gspec b/test/acceptance/typography.gspec
@@ -22,7 +22,7 @@
 = Typography classes =
 	@on desktop
 		paragraph:
-			css color matches "#565a5c|rgba\\(86, 90, 92, 1\\)|rgb\\(86, 90, 92\\)"
+			css color matches "#494c4e|rgba\\(73, 76, 78, 1\\)|rgb\\(73, 76, 78\\)"
 			css font-family matches "(?i)['|\"]*lato['|\"]*,\\s*['|\"]lucida sans unicode['|\"],\\s*['|\"]lucida grande['|\"],\\s*sans-serif"
 			css font-size is "19px"
 			css font-weight matches "normal|400"
@@ -81,7 +81,7 @@
 			css font-size is "16px"
 			css line-height is "24px"
 		small:
-			css color matches "#72777a|rgba\\(114, 119, 122, 1\\)|rgb\\(114, 119, 122\\)"
+			css color matches "#6e7376|rgba\\(110, 115, 118, 1\\)|rgb\\(110, 115, 118\\)"
 			css font-size is "14px"
 			css line-height is "20px"
 	@on mobile