Преглед изворни кода

Merge pull request #8641 from weseek/imprv/personal-dropdown-style

imprv: PersonalDropdown style
Yuki Takei пре 2 година
родитељ
комит
976abf53f7

+ 18 - 10
apps/app/src/components/Sidebar/SidebarNav/PersonalDropdown.module.scss

@@ -1,5 +1,23 @@
 @use '@growi/core/scss/bootstrap/init' as bs;
 @use '@growi/core/scss/bootstrap/init' as bs;
 
 
+.btn-personal-dropdown :global {
+  img {
+    border: 2px solid var(--bs-border-color-translucent);
+  }
+}
+
+.personal-dropdown-header :global {
+  .item-text-email {
+    font-size: 10.5px;
+  }
+}
+
+.personal-dropdown-menu :global {
+  --bs-dropdown-font-size: 14px;
+}
+
+
+// == Colors
 @include bs.color-mode(light) {
 @include bs.color-mode(light) {
   .personal-dropdown-header :global {
   .personal-dropdown-header :global {
     color: var(--bs-gray-600);
     color: var(--bs-gray-600);
@@ -21,13 +39,3 @@
     color: var(--bs-gray-500);
     color: var(--bs-gray-500);
   }
   }
 }
 }
-
-.personal-dropdown-menu :global {
-  --bs-dropdown-font-size: 14px;
-}
-
-.personal-dropdown-header :global {
-  .item-text-email {
-    font-size: 10.5px;
-  }
-}

+ 1 - 1
apps/app/src/components/Sidebar/SidebarNav/PersonalDropdown.tsx

@@ -45,7 +45,7 @@ export const PersonalDropdown = (): JSX.Element => {
         direction="end"
         direction="end"
       >
       >
         <DropdownToggle
         <DropdownToggle
-          className="btn btn-primary"
+          className={`btn btn-primary ${styles['btn-personal-dropdown']} opacity-100`}
           data-testid="personal-dropdown-button"
           data-testid="personal-dropdown-button"
         >
         >
           <UserPicture user={currentUser} noLink noTooltip />
           <UserPicture user={currentUser} noLink noTooltip />

+ 4 - 6
apps/app/src/components/Sidebar/SidebarNav/SecondaryItems.module.scss

@@ -7,13 +7,11 @@
   .btn {
   .btn {
     @extend %btn-basis;
     @extend %btn-basis;
 
 
-    span {
-      opacity: 0.6;
+    opacity: 0.6;
 
 
-      &:hover,
-      &:focus {
-        opacity: 0.8;
-      }
+    &:hover,
+    &:focus {
+      opacity: 0.8;
     }
     }
   }
   }
 }
 }