Half-assed sort and dao options menu reskin. Needs more work

decentdao · Apr 19, 2024 · 3da8ee7 · 3da8ee7
1 parent f5c0b5b
commit 3da8ee7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/src/components/ui/menus/OptionMenu/OptionsList.tsx b/src/components/ui/menus/OptionMenu/OptionsList.tsx
@@ -20,11 +20,7 @@ export function OptionsList({
   return (
     <>
       {titleKey && (
-        <Text
-          textStyle="text-sm-sans-regular"
-          color="chocolate.200"
-          marginBottom="0.5rem"
-        >
+        <Text marginBottom="0.5rem" textStyle="helper-text-small" color="neutral-7">
           {t(titleKey)}
         </Text>
       )}
@@ -36,11 +32,8 @@ export function OptionsList({
               as={showOptionSelected ? Box : Text}
               onClick={clickListener}
               cursor="pointer"
-              textStyle="text-base-mono-medium"
-              color="grayscale.100"
-              _hover={{ color: 'gold.200', textDecoration: 'none' }}
-              paddingStart="0rem"
-              paddingEnd="0rem"
+              _hover={{ bg: 'neutral-3', textDecoration: 'none' }}
+              p="0.5rem 1rem"
               gap={2}
               closeOnSelect={closeOnSelect}
               data-testid={'optionMenu-' + option.optionKey}
@@ -50,7 +43,6 @@ export function OptionsList({
                   <Checkbox
                     isChecked={option.isSelected}
                     onChange={clickListener}
-                    colorScheme="gold"
                     iconColor="black.900"
                     marginEnd="0.5rem"
                   />
@@ -62,7 +54,6 @@ export function OptionsList({
               {showOptionCount && (
                 <Text
                   textStyle="text-base-mono-medium"
-                  color={option.count ? 'grayscale.100' : 'grayscale.500'}
                   as="span"
                 >
                   {option.count}
@@ -73,7 +64,7 @@ export function OptionsList({
               <Divider
                 marginTop="0.25rem"
                 marginBottom="0.25rem"
-                color="chocolate.700"
+                color="neutral-3"
               />
             )}
           </Box>

diff --git a/src/components/ui/menus/OptionMenu/index.tsx b/src/components/ui/menus/OptionMenu/index.tsx
@@ -50,13 +50,14 @@ export function OptionMenu({
           {trigger}
         </MenuButton>
       </Tooltip>
+
       <MenuList
-        rounded="lg"
-        shadow="menu-gold"
+        borderWidth="1px"
+        borderColor="neutral-3"
+        borderRadius="0.5rem"
+        bg="neutral-2" // neutral-2-84 ??
+        p="0.5rem 1rem"
         mr={['auto', '1rem']}
-        bg="grayscale.black"
-        border="none"
-        padding="1rem"
         zIndex={1000}
       >
         {children}

diff --git a/src/components/ui/utils/Sort.tsx b/src/components/ui/utils/Sort.tsx
@@ -19,9 +19,7 @@ function SortMenuItem({
       py="0.5rem"
       color="grayscale.100"
       sx={{
-        '&:hover': {
-          color: 'gold.500',
-        },
+        '&:hover': { bg: 'neutral-3' },
       }}
       data-testid={testId}
       onClick={onClick}