X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fbootstrap.scss;h=5c1ce1028b6515214f39e8d1e0aece4108c1a25b;hb=d96994289b24c4bbd056660c5fe11fff0f77635e;hp=e10b8459635dc69938cc01ad8dd448ec0f7d4018;hpb=134cf2bce96a8c5aefd55154e884964975d8cf23;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index e10b84596..5c1ce1028 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -13,6 +13,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   flex: auto;
 }
 
+.c-hand {
+  cursor: pointer;
+}
+
 @keyframes spin {
   from {
     transform: scale(1) rotate(0deg);
@@ -22,11 +26,18 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
-.dropdown {
+/* 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 {
+  z-index: z(dropdown) !important;
   border-radius: 3px;
   box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
   font-size: 15px;
@@ -39,6 +50,10 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
       background-color: var(--mainHoverColor);
       opacity: .9;
     }
+    
+    &::after {
+      display: none;
+    }
   }
 
   button {
@@ -85,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;
+      }
     }
   }
 
@@ -103,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;
@@ -138,7 +158,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
-ngb-tabset.bootstrap {
+ngb-tabset {
 
   .nav-link {
     &, & a {
@@ -153,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 {
@@ -187,6 +219,14 @@ ngb-modal-window {
   z-index: z(modal) !important;
 }
 
+ngb-popover-window {
+  z-index: z(popover) !important;
+}
+
+ngb-tooltip-window {
+  z-index: z(tooltip) !important;
+}
+
 .btn-outline-tertiary {
   color: var(--secondaryColor);
   border-color: var(--secondaryColor);