Merge branch 'main' into fix/text-area-scrollbar-borders

gravity-ui · May 7, 2024 · 782b1c7 · 782b1c7
2 parents 9ec09e0 + aeda6fe
commit 782b1c7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/src/demo/colors/Base.tsx b/src/demo/colors/Base.tsx
@@ -338,6 +338,11 @@ const floats = [
         title: 'Float Hover',
         description: 'Hover for Float.',
     },
+    {
+        name: 'base-float-medium',
+        title: 'Float Medium',
+        description: 'Float for medium contrast.',
+    },
     {
         name: 'base-float-heavy',
         title: 'Float Heavy',

diff --git a/styles/themes/dark-hc/base.scss b/styles/themes/dark-hc/base.scss
@@ -73,6 +73,7 @@
     --g-color-base-float: var(--g-color-private-white-100-solid);
 
     --g-color-base-float-hover: var(--g-color-private-white-200-solid);
+    --g-color-base-float-medium: var(--g-color-private-white-200-solid);
     --g-color-base-float-heavy: var(--g-color-private-white-300-solid);
     --g-color-base-float-accent: var(--g-color-private-white-300-solid);
     --g-color-base-float-accent-hover: var(--g-color-private-white-400-solid);

diff --git a/styles/themes/dark/base.scss b/styles/themes/dark/base.scss
@@ -72,6 +72,7 @@
 
     --g-color-base-float: var(--g-color-private-white-100-solid);
     --g-color-base-float-hover: var(--g-color-private-white-150-solid);
+    --g-color-base-float-medium: var(--g-color-private-white-150-solid);
     --g-color-base-float-heavy: var(--g-color-private-white-250-solid);
     --g-color-base-float-accent: var(--g-color-private-white-150-solid);
     --g-color-base-float-accent-hover: var(--g-color-private-white-200-solid);

diff --git a/styles/themes/light-hc/base.scss b/styles/themes/light-hc/base.scss
@@ -72,6 +72,7 @@
 
     --g-color-base-float: var(--g-color-private-white-1000-solid);
     --g-color-base-float-hover: var(--g-color-private-black-150-solid);
+    --g-color-base-float-medium: var(--g-color-private-black-550-solid);
     --g-color-base-float-heavy: var(--g-color-private-black-700-solid);
     --g-color-base-float-accent: var(--g-color-private-white-1000-solid);
     --g-color-base-float-accent-hover: var(--g-color-private-white-850);

diff --git a/styles/themes/light/base.scss b/styles/themes/light/base.scss
@@ -72,6 +72,7 @@
 
     --g-color-base-float: var(--g-color-private-white-1000-solid);
     --g-color-base-float-hover: var(--g-color-private-black-50-solid);
+    --g-color-base-float-medium: var(--g-color-private-black-550-solid);
     --g-color-base-float-heavy: var(--g-color-private-black-700-solid);
     --g-color-base-float-accent: var(--g-color-private-white-1000-solid);
     --g-color-base-float-accent-hover: var(--g-color-private-white-850);