Merge branch 'main' into rewrite-select

ClickHouse · Sep 25, 2023 · c487ce0 · c487ce0
2 parents 626241e + e0aae9b
commit c487ce0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 23 deletions.
diff --git a/src/styles/variables.classic.json b/src/styles/variables.classic.json
@@ -141,13 +141,13 @@
         "primary": {
           "background": {
             "main": {
-              "default": "lch(75 71.4 79.3)",
+              "default": "#FFC029",
               "hover": "lch(81.7 41.9 82.1)",
               "active": "lch(75.6 38.8 82.1)",
               "disabled": "lch(81.3 0 0)"
             },
             "action": {
-              "default": "lch(71.3 67.8 79.3)",
+              "default": "lch(77.8 74.1 79.3)",
               "hover": "lch(77.6 39.8 82.1)",
               "active": "lch(69.2 35.5 82.1)",
               "disabled": "lch(74.4 0 0)"
@@ -166,7 +166,7 @@
             "disabled": "rgba(0,0,0,0)"
           },
           "divide": {
-            "default": "lch(62.4 59.3 79.3)",
+            "default": "lch(68.1 64.8 79.3)",
             "hover": "lch(71.5 36.7 82.1)",
             "active": "lch(66.1 33.9 82.1)",
             "disabled": "lch(71.1 0 0)"

diff --git a/src/styles/variables.dark.json b/src/styles/variables.dark.json
@@ -253,7 +253,7 @@
         "primary": {
           "background": {
             "main": {
-              "default": "lch(89.3 64.5 103)",
+              "default": "#FAFF69",
               "hover": "lch(89.9 45.1 103)",
               "active": "lch(82.5 59.7 103)",
               "disabled": "lch(25.2 0 0)"
@@ -278,7 +278,7 @@
             "disabled": "rgba(0,0,0,0)"
           },
           "divide": {
-            "default": "lch(78.1 56.4 103)",
+            "default": "lch(85.4 61.7 103)",
             "hover": "lch(78.7 39.5 103)",
             "active": "lch(72.2 52.2 103)",
             "disabled": "lch(23.1 0 0)"
@@ -288,7 +288,7 @@
           "divide": {
             "default": "lch(31.2 0 0)",
             "hover": "lch(34.8 0 0)",
-            "active": "lch(20.5 2.21 306)",
+            "active": "lch(24.1 2.6 306)",
             "disabled": "lch(23.4 0 0)"
           },
           "background": {

diff --git a/src/styles/variables.json b/src/styles/variables.json
@@ -511,7 +511,7 @@
         "primary": {
           "background": {
             "main": {
-              "default": "lch(17.6 2.54 306)",
+              "default": "#302e32",
               "hover": "lch(27 3.82 267)",
               "active": "lch(5.87 1.22 305)",
               "disabled": "lch(81.3 0 0)"
@@ -545,8 +545,8 @@
         "secondary": {
           "divide": {
             "default": "lch(92 1.05 266)",
-            "hover": "lch(33 3.27 267)",
-            "active": "lch(16.4 2.36 306)",
+            "hover": "lch(92.4 0.99 266)",
+            "active": "lch(83.8 2.3 258)",
             "disabled": "lch(75.5 0 0)"
           },
           "background": {

diff --git a/src/styles/variables.light.json b/src/styles/variables.light.json
@@ -253,7 +253,7 @@
         "primary": {
           "background": {
             "main": {
-              "default": "lch(17.6 2.54 306)",
+              "default": "#302e32",
               "hover": "lch(27 3.82 267)",
               "active": "lch(5.87 1.22 305)",
               "disabled": "lch(81.3 0 0)"
@@ -287,8 +287,8 @@
         "secondary": {
           "divide": {
             "default": "lch(92 1.05 266)",
-            "hover": "lch(33 3.27 267)",
-            "active": "lch(16.4 2.36 306)",
+            "hover": "lch(92.4 0.99 266)",
+            "active": "lch(83.8 2.3 258)",
             "disabled": "lch(75.5 0 0)"
           },
           "background": {

diff --git a/tokens/themes/$themes.json b/tokens/themes/$themes.json
@@ -1278,8 +1278,8 @@
       "click.flyout.color.stroke.default": "62f3f25189e2beeb7b932554c0ded0be94c1145c",
       "click.storybook.global.background": "1df4a5519f86724132572868edc00b9ba9e7ff4f",
       "click.button.split.secondary.divide.default": "1a27cb10cae0456ccf456beedced55497e7befbc",
-      "click.button.split.secondary.divide.active": "fc72dca1f0b6c3ef45e8e1bb510baa64138a0af2",
       "click.button.split.secondary.divide.hover": "28137fd7e94263b4e460f0644999673feb73556f",
+      "click.button.split.secondary.divide.active": "fc72dca1f0b6c3ef45e8e1bb510baa64138a0af2",
       "click.button.split.secondary.divide.disabled": "7e1c062e1100513d825469daf1550b9bae9a84a5",
       "click.button.split.secondary.background.main.default": "c2b4080d70ec35bb943f2a6261e14eddf6e6e7ad",
       "click.button.split.secondary.background.main.hover": "b32087d1eab0b965a8dcdc9e35cc0adf648e78f7",

diff --git a/tokens/themes/classic.json b/tokens/themes/classic.json
@@ -489,7 +489,7 @@
           "background": {
             "main": {
               "default": {
-                "value": "{click.button.basic.color.primary.background.default}",
+                "value": "#FFC029",
                 "type": "color",
                 "$extensions": {}
               },

diff --git a/tokens/themes/light.json b/tokens/themes/light.json
@@ -833,15 +833,7 @@
               "default": {
                 "value": "{click.button.basic.color.primary.background.default}",
                 "type": "color",
-                "$extensions": {
-                  "studio.tokens": {
-                    "modify": {
-                      "type": "darken",
-                      "value": "0.085",
-                      "space": "lch"
-                    }
-                  }
-                }
+                "$extensions": {}
               },
               "hover": {
                 "value": "{click.button.basic.color.primary.background.hover}",