Browse Source

Some slight styling tweaks per design spec.

barnabasmolnar 2 years ago
parent
commit
74cb027fd7

+ 3 - 3
src/components/dropdownMenu/DropdownMenu.scss

@@ -53,8 +53,8 @@
 
 
     .dropdown-menu-item-base {
     .dropdown-menu-item-base {
       display: flex;
       display: flex;
-      padding: 0 0.625rem;
-      column-gap: 0.625rem;
+      padding: 0 0.75rem;
+      column-gap: 0.5rem;
       font-size: 0.875rem;
       font-size: 0.875rem;
       color: var(--color-gray-100);
       color: var(--color-gray-100);
       width: 100%;
       width: 100%;
@@ -70,7 +70,7 @@
       align-items: center;
       align-items: center;
       height: 2rem;
       height: 2rem;
       cursor: pointer;
       cursor: pointer;
-      border-radius: var(--border-radius-md);
+      border-radius: var(--border-radius-sm);
 
 
       @media screen and (min-width: 1921px) {
       @media screen and (min-width: 1921px) {
         height: 2.25rem;
         height: 2.25rem;

+ 1 - 1
src/components/dropdownMenu/DropdownMenuContent.tsx

@@ -57,7 +57,7 @@ const MenuContent = ({
         ) : (
         ) : (
           <Island
           <Island
             className="dropdown-menu-container"
             className="dropdown-menu-container"
-            padding={2}
+            padding={1}
             style={{ zIndex: 2 }}
             style={{ zIndex: 2 }}
           >
           >
             {children}
             {children}

+ 6 - 2
src/components/dropdownMenu/DropdownMenuSubContent.tsx

@@ -18,13 +18,17 @@ const DropdownMenuSubContent = ({
   }).trim();
   }).trim();
 
 
   return (
   return (
-    <DropdownMenuPrimitive.SubContent className={classNames}>
+    <DropdownMenuPrimitive.SubContent
+      className={classNames}
+      sideOffset={8}
+      alignOffset={-4}
+    >
       {device.isMobile ? (
       {device.isMobile ? (
         <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
         <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
       ) : (
       ) : (
         <Island
         <Island
           className="dropdown-menu-container"
           className="dropdown-menu-container"
-          padding={2}
+          padding={1}
           style={{ zIndex: 1 }}
           style={{ zIndex: 1 }}
         >
         >
           {children}
           {children}

+ 1 - 0
src/css/theme.scss

@@ -126,6 +126,7 @@
   --color-success: #268029;
   --color-success: #268029;
   --color-success-lighter: #cafccc;
   --color-success-lighter: #cafccc;
 
 
+  --border-radius-sm: 0.25rem;
   --border-radius-md: 0.375rem;
   --border-radius-md: 0.375rem;
   --border-radius-lg: 0.5rem;
   --border-radius-lg: 0.5rem;
 
 

+ 7 - 0
src/packages/excalidraw/example/App.tsx

@@ -593,6 +593,13 @@ export default function App({ appTitle, useCustom, customArgs }: AppProps) {
                 </MainMenu.Sub.Item>
                 </MainMenu.Sub.Item>
               </MainMenu.Sub.Content>
               </MainMenu.Sub.Content>
             </MainMenu.Sub>
             </MainMenu.Sub>
+            <MainMenu.Sub.Item
+              onSelect={() => {
+                alert("wow, nested submenus! very cool");
+              }}
+            >
+              Another one
+            </MainMenu.Sub.Item>
           </MainMenu.Sub.Content>
           </MainMenu.Sub.Content>
         </MainMenu.Sub>
         </MainMenu.Sub>
         <MainMenu.ItemCustom>
         <MainMenu.ItemCustom>

+ 2 - 2
src/tests/packages/__snapshots__/excalidraw.test.tsx.snap

@@ -19,7 +19,7 @@ exports[`<Excalidraw/> <MainMenu/> should render main menu with host menu items
 >
 >
   <div
   <div
     class="Island dropdown-menu-container"
     class="Island dropdown-menu-container"
-    style="--padding: 2; z-index: 2;"
+    style="--padding: 1; z-index: 2;"
   >
   >
     <div
     <div
       class="radix-menu-item"
       class="radix-menu-item"
@@ -155,7 +155,7 @@ exports[`<Excalidraw/> Test UIOptions prop Test canvasActions should render menu
 >
 >
   <div
   <div
     class="Island dropdown-menu-container"
     class="Island dropdown-menu-container"
-    style="--padding: 2; z-index: 2;"
+    style="--padding: 1; z-index: 2;"
   >
   >
     <div
     <div
       class="radix-menu-item"
       class="radix-menu-item"