Merge branch 'main' into gj-bigStat-update2

ClickHouse · Dec 1, 2023 · 1e94219 · 1e94219
2 parents 6cceda2 + dfbefa4
commit 1e94219
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 23 deletions.
diff --git a/tokens/themes/component.json b/tokens/themes/component.json
@@ -474,34 +474,34 @@
         "typography": {
           "label": {
             "default": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{typography.styles.product.text.normal.md}",
               "type": "typography"
             },
             "hover": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             },
             "active": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             },
             "disabled": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             }
           },
           "mobile": {
             "label": {
               "default": {
-                "value": "{typography.styles.product.text.medium.lg}",
+                "value": "{typography.styles.product.text.normal.lg}",
                 "type": "typography"
               },
               "hover": {
-                "value": "{typography.styles.product.text.medium.lg}",
+                "value": "{click.button.basic.typography.mobile.label.default}",
                 "type": "typography"
               },
               "active": {
-                "value": "{typography.styles.product.text.semibold.lg}",
+                "value": "{click.button.basic.typography.mobile.label.default}",
                 "type": "typography"
               }
             }
@@ -680,26 +680,26 @@
         "typography": {
           "label": {
             "default": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             },
             "hover": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             },
             "active": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             },
             "disabled": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.label.default}",
               "type": "typography"
             }
           },
           "mobile": {
             "label": {
               "default": {
-                "value": "{typography.styles.product.text.medium.lg}",
+                "value": "{click.button.basic.typography.mobile.label.default}",
                 "type": "typography"
               },
               "hover": {
@@ -1434,11 +1434,11 @@
               "type": "typography"
             },
             "hover": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.mobile.label.default}",
               "type": "typography"
             },
             "active": {
-              "value": "{typography.styles.product.text.medium.md}",
+              "value": "{click.button.basic.typography.mobile.label.default}",
               "type": "typography"
             }
           }

diff --git a/tokens/themes/dark.json b/tokens/themes/dark.json
@@ -1730,14 +1730,32 @@
         "background": {
           "default": {
             "value": "{palette.neutral.725}",
-            "type": "color"
+            "type": "color",
+            "$extensions": {
+              "studio.tokens": {
+                "modify": {
+                  "type": "lighten",
+                  "value": "0.025",
+                  "space": "lch"
+                }
+              }
+            }
           },
           "hover": {
-            "value": "{click.global.color.background.muted}",
-            "type": "color"
+            "value": "{click.field.color.background.default}",
+            "type": "color",
+            "$extensions": {
+              "studio.tokens": {
+                "modify": {
+                  "type": "lighten",
+                  "value": "0.025",
+                  "space": "lch"
+                }
+              }
+            }
           },
           "active": {
-            "value": "{click.global.color.background.default}",
+            "value": "{click.field.color.background.hover}",
             "type": "color"
           },
           "disabled": {
@@ -3280,7 +3298,7 @@
       "color": {
         "background": {
           "default": {
-            "value": "{click.alert.color.background.default}",
+            "value": "{click.global.color.background.muted}",
             "type": "color"
           }
         },

diff --git a/tokens/themes/light.json b/tokens/themes/light.json
@@ -123,7 +123,7 @@
               "studio.tokens": {
                 "modify": {
                   "type": "lighten",
-                  "value": "0.025",
+                  "value": "0.045",
                   "space": "lch"
                 }
               }

diff --git a/tokens/themes/primitives.json b/tokens/themes/primitives.json
@@ -529,7 +529,7 @@
           "xs": {
             "value": {
               "fontFamily": "{typography.font.families.regular}",
-              "fontWeight": "{typography.font.weights.4}",
+              "fontWeight": "{typography.font.weights.3}",
               "fontSize": "{typography.font.sizes.1}",
               "lineHeight": "{typography.font.line-height.1}"
             },
@@ -538,7 +538,7 @@
           "sm": {
             "value": {
               "fontFamily": "{typography.font.families.regular}",
-              "fontWeight": "{typography.font.weights.4}",
+              "fontWeight": "{typography.font.weights.3}",
               "lineHeight": "{typography.font.line-height.1}",
               "fontSize": "{typography.font.sizes.2}"
             },
@@ -985,7 +985,7 @@
         "type": "other"
       },
       "medium": {
-        "value": "150ms",
+        "value": "100ms",
         "type": "other"
       },
       "fast": {