Merge remote-tracking branch 'upstream/master' into US79943

# Conflicts: # d2l-typography-shared-styles.html
BrightspaceUI · Nov 29, 2016 · ef0fa6e · ef0fa6e
2 parents 6b2a04e + 51a8ae2
commit ef0fa6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -13,7 +13,7 @@
     "package.json"
   ],
   "dependencies": {
-    "d2l-colors": "^2.2.0",
+    "d2l-colors": "^2.2.2",
     "polymer": "^1.7.0"
   }
 }
diff --git a/d2l-typography-shared-styles.html b/d2l-typography-shared-styles.html
@@ -3,7 +3,7 @@
 <dom-module id="d2l-typography-shared-styles">
 	<template>
 		<style>
-			html {
+			:root {
 				--d2l-body-standard-text: {
 					font-size: 0.95rem;
 					font-weight: 400;