Improve detail

master-co · Jun 14, 2024 · 3b6f4dc · 3b6f4dc
1 parent 385ac87
commit 3b6f4dc
Show file tree

Hide file tree

Showing 12 changed files with 1,021 additions and 72 deletions.
diff --git a/internal b/internal
diff --git a/packages/core/src/badge.ts b/packages/core/src/badge.ts
@@ -10,7 +10,8 @@ export const badgeSizes = {
 
 export const badgeColors = {
     primary: 'primary',
-    red: 'red'
+    red: 'red',
+    purple: 'purple'
 }
 
 export default {

diff --git a/packages/core/src/button.ts b/packages/core/src/button.ts
@@ -9,7 +9,7 @@ export const buttonSizes = {
 }
 
 export const buttonColors = {
-    primary: 'primary touch-primary'
+    primary: 'primary bg:touch-primary:active:not(.loading)'
 }
 
 export default {

diff --git a/packages/core/src/master.css.ts b/packages/core/src/master.css.ts
@@ -12,10 +12,7 @@ const ui = {
     styles: {
         primary: 'bg:primary fg:primary-contrast outline:1|primary-ring',
         red: 'bg:red fg:red-contrast outline:1|red-ring',
-        touch: {
-            primary: 'bg:touch-primary:hover',
-            red: 'bg:touch-red:hover'
-        }
+        purple: 'bg:purple fg:purple-contrast outline:1|purple-ring'
     },
     variables: {
         primary: {
@@ -30,6 +27,12 @@ const ui = {
                 '@dark': '$(white)/.2'
             }
         },
+        purple: {
+            ring: {
+                '@light': '$(black)/.15',
+                '@dark': '$(white)/.2'
+            }
+        },
         touch: {
             primary: {
                 '@light': '$(primary-30)',
@@ -38,14 +41,19 @@ const ui = {
             red: {
                 '@light': '$(red-30)',
                 '@dark': '$(red-40)'
+            },
+            purple: {
+                '@light': '$(purple-30)',
+                '@dark': '$(purple-40)'
             }
         },
         text: {
             'primary-contrast': {
                 '@light': '$(primary-90)',
                 '@dark': '$(primary-95)'
             },
-            'red-contrast': '$(white)'
+            'red-contrast': '$(white)',
+            'purple-contrast': '$(white)'
         }
     }
 } as Config

diff --git a/packages/core/src/segments.ts b/packages/core/src/segments.ts
@@ -2,8 +2,8 @@ import type { Config } from '@master/css'
 
 export const segmentsSizes = {
     sm: 'p:1 r:4 h:24 {font:12;px:10;r:4}_.segment',
-    md: 'p:5 r:8 h:32 {font:12;px:10;r:4}_.segment',
-    lg: 'p:6 r:10 h:40 {font:14;px:12;r:5}_.segment'
+    md: 'p:5 r:6 h:32 {font:12;px:10;r:2}_.segment',
+    lg: 'p:5 r:6 h:40 {font:14;px:12;r:2}_.segment'
 }
 
 export default {

diff --git a/packages/react/src/SelectChevronIndicator.tsx b/packages/react/src/SelectChevronIndicator.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx'
 import type { SVGProps } from 'react'
 
 const SelectChevronIndicator = ({ className, ...props }: SVGProps<SVGSVGElement>) => (
-    <svg {...props} className={clsx('select-indicator right:.5em', className)} xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+    <svg {...props} className={clsx('select-indicator right:.5em', className)} xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.2" strokeLinecap="round" strokeLinejoin="round">
         <path d="M6 9l6 6l6 -6"></path>
     </svg>
 )

diff --git a/packages/react/src/SelectIndicator.tsx b/packages/react/src/SelectIndicator.tsx
@@ -2,7 +2,7 @@ import clsx from 'clsx'
 import type { SVGProps } from 'react'
 
 const SelectIndicator = ({ className, ...props }: SVGProps<SVGSVGElement>) => (
-    <svg {...props} className={clsx('select-indicator right:.25em', className)} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="1.5em" height="1.5em" fill="none" stroke="currentColor" strokeWidth="1" strokeLinecap="round" strokeLinejoin="round">
+    <svg {...props} className={clsx('select-indicator right:.5em', className)} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="1.25em" height="1.25em" fill="none" stroke="currentColor" strokeWidth="1.2" strokeLinecap="round" strokeLinejoin="round">
         <path stroke="none" d="M0 0h24v24H0z" />
         <path d="M8 9l4 -4l4 4" /><path d="M16 15l-4 4l-4 -4" />
     </svg>