Update server dependencies

[github/Chocobozzz/PeerTube.git] / client / src / sass / bootstrap.scss

diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index bb7b21274e147e9e0aaa679be694e066d556d07d..5c1ce1028b6515214f39e8d1e0aece4108c1a25b 100644 (file)
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -29,6 +29,11 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 /* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
 .dropdown:not(.btn-group) {
   z-index: z(dropdown) !important;
+
+  &.list-overflow-menu,
+  &.parent-entry {
+    z-index: z(header) - 1 !important;
+  }
 }
 
 .dropdown-menu {
@@ -95,15 +100,20 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
     }
 
     my-global-icon {
-      @include icon(24px);
+      @include icon(22px);
 
       position: relative;
-      top: 3px;
+      top: 5px;
       float: right;
 
       margin: 0;
       padding: 0;
-      opacity: 1;
+      opacity: .5;
+
+      &[iconName="cross"] {
+        @include icon(16px);
+        top: -3px;
+      }
     }
   }
 
@@ -113,7 +123,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
     .action-button-cancel {
       @include peertube-button;
-      @include grey-button;
+      @include tertiary-button;
 
       display: inline-block;
       margin-right: 10px;
@@ -148,7 +158,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
-ngb-tabset.bootstrap {
+ngb-tabset {
 
   .nav-link {
     &, & a {
@@ -163,9 +173,21 @@ ngb-tabset.bootstrap {
   }
 }
 
-.nav-tabs .nav-link.active {
-  background-color: var(--mainBackgroundColor) !important;
-  border-bottom: none;
+.nav-tabs .nav-link {
+  &:not(.active) {
+    border-bottom: 3px solid transparent;
+  }
+  &.active {
+    font-weight: $font-semibold;
+    background-color: var(--mainBackgroundColor) !important;
+    border: none;
+    border-bottom: 2px solid var(--mainColor);
+  }
+  &:hover {
+    border-top-color: transparent;
+    border-left-color: transparent;
+    border-right-color: transparent;
+  }
 }
 
 .card {