Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / menu / notification.component.scss

diff --git a/client/src/app/menu/notification.component.scss b/client/src/app/menu/notification.component.scss
index d85cc8e66c5d24eb234bacb24968aae7f01f716c..7f72c98d120e4d3254983e67690d4f5a0fa0ca7f 100644 (file)
--- a/client/src/app/menu/notification.component.scss
+++ b/client/src/app/menu/notification.component.scss
@@ -1,8 +1,8 @@
-@import '_variables';
-@import '_mixins';
+@use '_variables' as *;
+@use '_mixins' as *;
 
 .content {
-  scrollbar-color: unset;
+  scrollbar-color: auto;
 }
 
 .notification-inbox-popover {
@@ -16,19 +16,20 @@
 .notification-inbox-popover,
 .notification-inbox-link a {
   @include apply-svg-color(#808080);
-  ::ng-deep {
-    svg {
-      transition: color .1s ease-in-out;
-    }
-  }
 
   transition: all .1s ease-in-out;
   border-radius: 25px;
   cursor: pointer;
 
-  &:hover, &:active {
-    background-color: rgba(255, 255, 255, 0.15);
+  ::ng-deep svg {
+    transition: color .1s ease-in-out;
+  }
+
+  &:hover,
+  &:active {
     @include apply-svg-color(#fff);
+
+    background-color: rgba(255, 255, 255, 0.15);
   }
 }
 
@@ -59,7 +60,7 @@
       font-size: 14px;
       font-family: $main-fonts;
       width: 400px;
-      box-shadow: 0 2px 6px rgba(0, 0, 0, 0.30);
+      box-shadow: 0 2px 6px rgba(0, 0, 0, 0.3);
 
       .loader {
         display: flex;
@@ -80,7 +81,7 @@
           max-height: 500px;
         }
 
-        & > my-user-notifications:nth-child(2) {
+        > my-user-notifications:nth-child(2) {
           overflow-y: auto;
           flex-grow: 1;
         }
@@ -110,13 +111,18 @@
           background: transparent;
         }
 
-        a, button {
+        a,
+        button {
           color: rgba(20, 20, 20, 0.5);
 
           &:hover:not(:disabled) {
             color: rgba(20, 20, 20, 0.8);
           }
         }
+
+        my-global-icon {
+          width: 20px;
+        }
       }
 
       .all-notifications {
@@ -133,12 +139,13 @@
   }
 }
 
-.notification-inbox-popover, .notification-inbox-link {
+.notification-inbox-popover,
+.notification-inbox-link {
   cursor: pointer;
   position: relative;
 
   .unread-notifications {
-    margin-left: 20px;
+    @include margin-left(20px);
   }
 
   .unread-notifications {