Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / sass / ng-select.scss

diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index 181ce4077b427b353ba70600121376c51352deb4..78e3a6de3727f503d497fe79bb5c2cf54d9acc20 100644 (file)
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -4,7 +4,7 @@
 $ng-select-highlight: #f2690d;
 // $ng-select-primary-text: #333 !default;
 // $ng-select-disabled-text: #f9f9f9 !default;
-// $ng-select-border: #ccc !default;
+$ng-select-border: $input-border-color;
 // $ng-select-border-radius: 4px !default;
 // $ng-select-bg: #ffffff !default;
 // $ng-select-selected: lighten($ng-select-highlight, 46) !default;
@@ -13,12 +13,13 @@ $ng-select-box-shadow: #{$focus-box-shadow-form} pvar(--mainColorLightest);
 // $ng-select-placeholder: lighten($ng-select-primary-text, 40) !default;
 $ng-select-height: 30px;
 $ng-select-value-padding-left: 15px;
-$ng-select-value-font-size: 15px;
+$ng-select-value-font-size: $form-input-font-size;
 
 @import '~@ng-select/ng-select/scss/default.theme';
 
 .ng-select {
   font-size: $ng-select-value-font-size;
+  line-height: $form-input-line-height;
 
   &.ng-select-focused {
     &:not(.ng-select-opened) > .ng-select-container {
@@ -32,8 +33,10 @@ $ng-select-value-font-size: 15px;
   }
 
   .ng-dropdown-panel .ng-dropdown-panel-items .ng-option {
-    color: pvar(--mainForegroundColor);
-    background-color: pvar(--mainBackgroundColor);
+    &:not(.ng-option-marked, .ng-option-selected) {
+      color: pvar(--mainForegroundColor);
+      background-color: pvar(--mainBackgroundColor);
+    }
   }
 
   .ng-select-container {
@@ -44,6 +47,14 @@ $ng-select-value-font-size: 15px;
     @include padding-right(12px);
   }
 
+  .ng-arrow {
+    border-color: #000 transparent transparent !important;
+  }
+
+  &.ng-select-opened .ng-arrow {
+    border-color: transparent transparent #000 !important;
+  }
+
   &.ng-select-single .ng-value-container .ng-value {
     color: pvar(--inputForegroundColor);