X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fbootstrap.scss;h=897182e538d0ef82d9fa747b0331c297a4744715;hb=ed5bb517266c80904c44bf44a335f1003f5aa277;hp=50f1dafedd7497f2a21df2685a1b97fc458ba54e;hpb=0d3a2982a9b29bd66a05e4b36e606518d4c09959;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 50f1dafed..897182e53 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -27,7 +27,7 @@ $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):not(.dropdown-root):not(.action-dropdown) {
+.dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown):not(.input-group-prepend) {
   z-index: z(dropdown) !important;
 
   &.list-overflow-menu,
@@ -37,6 +37,8 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 }
 
 .dropdown-menu {
+  z-index: z(dropdown) + 1 !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;
@@ -49,8 +51,8 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
     padding: 3px 15px;
 
     &.active {
-      color: var(--mainBackgroundColor) !important;
-      background-color: var(--mainHoverColor);
+      color: pvar(--mainBackgroundColor) !important;
+      background-color: pvar(--mainHoverColor);
       opacity: .9;
     }
 
@@ -92,7 +94,7 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   text-align: center;
 
   .modal-content {
-    background-color: var(--mainBackgroundColor);
+    background-color: pvar(--mainBackgroundColor);
   }
 
   .modal-header {
@@ -141,6 +143,14 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
   }
 }
 
+
+// On desktop browsers, make the content and header horizontally sticked to right not move when modal open and close
+.modal-open {
+  overflow-y: scroll !important; // Make sure vertical scroll bar is always visible on desktop browsers to get disabled scrollbar effect
+  position: fixed; // Fix the body position to disable any scroll content
+  width: 100vw; // Make sure the content fits all the available width when position: fixed
+}
+
 // Nav customizations
 .nav .nav-link {
   display: flex !important;
@@ -151,46 +161,45 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 
 .nav.nav-pills {
   font-size: 16px !important;
+  font-weight: $font-semibold !important;
 
-  .nav-link.active {
-    font-weight: $font-semibold !important;
+  .nav-link {
+    opacity: 0.6 !important;
+
+    &.active, &:hover, &:active, &:focus {
+      opacity: 1 !important;
+    }
   }
 
   a {
     @include disable-default-a-behaviour;
 
-    color: var(--mainForegroundColor);
+    color: pvar(--mainForegroundColor);
   }
 }
 
-.nav-tabs {
+.nav-tabs .nav-link {
+  @include disable-default-a-behaviour;
 
-  .nav-link {
-    @include disable-default-a-behaviour;
+  color: pvar(--mainForegroundColor);
+  font-weight: $font-semibold;
+  border: none;
+  border-bottom: 2px solid transparent;
+  opacity: 0.6;
 
-    color: var(--mainForegroundColor) !important;
-  }
-}
-
-.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);
+    color: pvar(--mainForegroundColor);
+    background-color: pvar(--mainBackgroundColor) !important;
+    border-bottom-color: pvar(--mainColor);
   }
-  &:hover {
-    border-top-color: transparent;
-    border-left-color: transparent;
-    border-right-color: transparent;
+
+  &.active, &:hover, &:active, &:focus {
+    opacity: 1;
   }
 }
 
 .card {
-  background-color: var(--mainBackgroundColor);
+  background-color: pvar(--mainBackgroundColor);
   border-color: #dee2e6;
 }
 
@@ -238,27 +247,27 @@ ngb-tooltip-window {
 }
 
 .btn-outline-tertiary {
-  color: var(--secondaryColor);
-  border-color: var(--secondaryColor);
+  color: pvar(--secondaryColor);
+  border-color: pvar(--secondaryColor);
 
   &:focus-within,
   &:focus,
   &:hover {
-    color: var(--mainBackgroundColor);
-    background-color: var(--secondaryColor);
+    color: pvar(--mainBackgroundColor);
+    background-color: pvar(--secondaryColor);
   }
 }
 
 // input box-shadow on focus
 .form-control {
   font-size: 15px;
-  color: var(--mainForegroundColor);
-  background-color: var(--inputBackgroundColor);
+  color: pvar(--mainForegroundColor);
+  background-color: pvar(--inputBackgroundColor);
   outline: none;
 
   &:focus-within,
   &:focus {
-    box-shadow: #{$focus-box-shadow-form} var(--mainColorLightest);
+    box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest);
 
     &.input-error {
       box-shadow: #{$focus-box-shadow-form} #{scale-color($red, $alpha: -75%)};
@@ -270,10 +279,9 @@ ngb-tooltip-window {
   & > .form-control {
     flex: initial;
   }
-
-  .input-group-prepend,
-  .input-group-append {
-    height: 30px;
+  input.form-control {
+    width: unset !important;
+    flex-grow: 1;
   }
 
   .input-group-prepend + input {
@@ -281,3 +289,35 @@ ngb-tooltip-window {
     border-bottom-left-radius: 0 !important;
   }
 }
+
+.has-feedback.has-clear {
+  position: relative;
+
+  input {
+    padding-right: 1.5rem !important;
+  }
+
+  .form-control-clear {
+    color: rgba(0, 0, 0, 0.4);
+    /*
+     * Enable pointer events as they have been disabled since Bootstrap 3.3
+     * See https://github.com/twbs/bootstrap/pull/14104
+     */
+    pointer-events: all;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    right: .5rem;
+    height: 95%;
+
+    &:hover {
+      color: rgba(0, 0, 0, 0.7);
+      cursor: pointer;
+    }
+  }
+
+  input:placeholder-shown + .form-control-clear {
+    display: none;
+  }
+}