RG-1746 do not hardcode color to "font"

JetBrains · Mar 26, 2018 · 46197f6 · 46197f6
1 parent 770c8a4
commit 46197f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/components/global/global.css b/components/global/global.css
@@ -49,8 +49,6 @@
 }
 
 .font {
-  color: text-color;
-
   /* This is a carefully tested set of fonts, do not touch without consulting with UI designers */
 
   font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Arial, sans-serif;

diff --git a/packages/docs/components/example-common.css b/packages/docs/components/example-common.css
@@ -1,4 +1,4 @@
-@value unit, font, font-size, line-height from '../node_modules/@jetbrains/ring-ui/components/global/global.css';
+@value unit, font, font-size, text-color, line-height from '../node_modules/@jetbrains/ring-ui/components/global/global.css';
 
 body {
   margin: unit calc(unit * 4) calc(unit * 2);
@@ -8,7 +8,10 @@ body {
 .body {
   composes: font;
 
+  color: text-color;
+
   font-size: font-size;
+
   line-height: line-height;
 }
 

diff --git a/packages/docs/components/index.css b/packages/docs/components/index.css
@@ -15,6 +15,8 @@ body {
 
   min-width: breakpoint-middle;
   min-height: 100vh;
+
+  color: text-color;
 }
 
 .headerItem {