Merge pull request #3400 from LiteFarmOrg/LF-4405/Floating_menu_butto…

…n_looks_different_from_what_is_designed LF-4405: floating menu button looks different from what is designed
LiteFarmOrg · Sep 26, 2024 · 974f7ac · 974f7ac
2 parents 4b22a75 + 02fe82c
commit 974f7ac
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/packages/webapp/src/assets/colors.scss b/packages/webapp/src/assets/colors.scss
@@ -14,6 +14,7 @@
   --secondaryGreen800: #495c51;
   --secondaryGreen200: #c1e6d2;
   --secondaryGreen50: #f2faf5;
+  --yellow900: #6b4d00;
   --yellow700: #ffb800;
   --yellow400: #fed450;
   --yellow300: #fce38d;

diff --git a/packages/webapp/src/components/Button/FloatingActionButton/styles.module.scss b/packages/webapp/src/components/Button/FloatingActionButton/styles.module.scss
@@ -16,20 +16,21 @@
 .floatingActionButton {
   position: relative;
 
-  &[aria-expanded="true"] {
-    background-color: #E3B000;
-  }
   @media (hover: hover) {
     &:hover {
-      background-color: #E3B000;
+      background-color: var(--Btn-primary-hover);
     }
   }
+  &[aria-expanded='true'] {
+    background-color: var(--yellow700);
+  }
 
   &.add {
-    &::before, &::after {
-      content: "";
+    &::before,
+    &::after {
+      content: '';
       position: absolute;
-      background-color: #634D00;
+      background-color: var(--yellow900);
       transition: 0.5s;
     }
 
@@ -47,17 +48,22 @@
       height: 4px;
     }
 
-    &[aria-expanded="true"] {
-      &::before, &::after {
-        background-color: #fff;
-      }
-    }
     @media (hover: hover) {
       &:hover {
-        &::before, &::after {
+        &::before,
+        &::after {
           background-color: #fff;
         }
       }
     }
+
+    &[aria-expanded='true'] {
+      box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.25);
+
+      &::before,
+      &::after {
+        background-color: var(--yellow900);
+      }
+    }
   }
 }
diff --git a/packages/webapp/src/components/Menu/FloatingButtonMenu/index.jsx b/packages/webapp/src/components/Menu/FloatingButtonMenu/index.jsx
@@ -72,9 +72,8 @@ export default function FloatingButtonMenu({
   };
 
   return (
-    <div className={clsx(styles.buttonWrapper, classes.button)}>
+    <div ref={anchorRef} className={clsx(styles.buttonWrapper, classes.button)}>
       <FloatingActionButton
-        ref={anchorRef}
         id="composition-button"
         aria-controls={open ? 'composition-menu' : undefined}
         aria-expanded={open ? 'true' : undefined}

diff --git a/packages/webapp/src/components/Menu/FloatingButtonMenu/styles.module.scss b/packages/webapp/src/components/Menu/FloatingButtonMenu/styles.module.scss
@@ -20,17 +20,18 @@
   box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
   display: flex;
   flex-direction: column;
-  gap: 1px;
+  gap: 8px;
   margin-bottom: 4px;
 }
 
 .menuItem {
   height: 48px;
   padding: 8px 16px;
-  color: #996E00;
+  border-radius: 8px;
+  color: #996e00;
   background-color: var(--yellow100);
   font-size: 16px;
-  font-weight: 700;
+  font-weight: 400;
   line-height: 24px;
   text-align: center;