fix: fixed themes and default font-family

core-ds · Jun 1, 2020 · 6bab367 · 6bab367
1 parent 522af20
commit 6bab367
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 17 deletions.
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -1,15 +1,16 @@
 addReviewers: true
 
 reviewers:
-  - stepancar
-  - FenkoAlex
-  - raylyanway
-  - ilatovsky
-  - aweppc
-  - IBelyaev
-  - 7rulnik
-  - pavelozavr
-  - denisx
+    - stepancar
+    - FenkoAlex
+    - raylyanway
+    - ilatovsky
+    - aweppc
+    - IBelyaev
+    - 7rulnik
+    - pavelozavr
+    - denisx
+    - vorozhtsoff
 
 skipKeywords:
-  - wip
+    - wip
diff --git a/packages/themes/src/default.css b/packages/themes/src/default.css
@@ -7,6 +7,6 @@
     --text-secondary-color: var(--color-dark-indigo-60-flat);
     --text-tertiary-color: var(--color-dark-indigo-30-flat);
     --border-radius: 4px;
-    --font-family: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue',
-        Helvetica, sans-serif;
+    --font-family: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Helvetica,
+        sans-serif;
 }
diff --git a/packages/themes/src/mixins/button/click.css b/packages/themes/src/mixins/button/click.css
@@ -1,4 +1,9 @@
 @define-mixin button-click {
+    /* core vars */
+    --color-red-brand: #ef3124;
+    --color-red-dark: #d91d0b;
+
+    /* ghost */
     --button-ghost-hover-color: var(--color-red-brand);
     --button-ghost-active-color: var(--color-red-dark);
 }
diff --git a/packages/themes/src/mixins/form-control/click.css b/packages/themes/src/mixins/form-control/click.css
@@ -1,4 +1,10 @@
 @define-mixin form-control-click {
+    /* core vars */
+    --color-dark-indigo-07-flat: #eeeff1;
+    --gap-s: 12px;
+    --gap-m: 16px;
+
+    /* base */
     --form-control-border-radius: 4px;
     --form-control-border-bottom: 0;
     --form-control-bg-color: var(--color-dark-indigo-07-flat);

diff --git a/packages/themes/src/mixins/pure-input/click.css b/packages/themes/src/mixins/pure-input/click.css
@@ -1,4 +1,10 @@
 @define-mixin pure-input-click {
+    /* core vars */
+    --color-dark-indigo-07-flat: #eeeff1;
+    --gap-s: 12px;
+    --gap-m: 16px;
+
+    /* base */
     --pure-input-border-radius: 4px;
     --pure-input-border-bottom: 0;
     --pure-input-bg-color: var(--color-dark-indigo-07-flat);

diff --git a/packages/vars/src/typography.css b/packages/vars/src/typography.css
@@ -1,7 +1,7 @@
 :root {
-    --font-family-system: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue',
-        Helvetica, sans-serif;
-    --font-family-styrene: 'Styrene UI', BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
+    --font-family-system: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Helvetica,
+        sans-serif;
+    --font-family-styrene: 'Styrene UI', system-ui, -apple-system, 'Segoe UI', Roboto,
         'Helvetica Neue', Helvetica, sans-serif;
 }
 

diff --git a/tools/templates/font-vars.css.hbs b/tools/templates/font-vars.css.hbs
@@ -1,6 +1,6 @@
 :root {
-    --font-family-system: BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue',
+    --font-family-system: system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue',
         Helvetica, sans-serif;
-    --font-family-styrene: 'Styrene UI', BlinkMacSystemFont, -apple-system, 'Segoe UI', Roboto,
+    --font-family-styrene: 'Styrene UI', system-ui, -apple-system, 'Segoe UI', Roboto,
         'Helvetica Neue', Helvetica, sans-serif;
 }