From 93487b1aebecea3540c9fa1c34389c63854f7430 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 1 Mar 2022 12:25:22 -0800
Subject: [PATCH 1/2] Fix bs5 selects

---
 .../app/components/manage/settings/settings.component.html  | 6 +++---
 src-ui/src/theme_dark.scss                                  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html
index a2868af2c..6c4de58de 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.html
+++ b/src-ui/src/app/components/manage/settings/settings.component.html
@@ -18,7 +18,7 @@
           </div>
           <div class="col">
 
-            <select class="form-control" formControlName="displayLanguage">
+            <select class="form-select" formControlName="displayLanguage">
               <option *ngFor="let lang of displayLanguageOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code && currentLocale != 'en-US'"> - {{lang.englishName}}</span></option>
             </select>
 
@@ -33,7 +33,7 @@
           </div>
           <div class="col">
 
-            <select class="form-control" formControlName="dateLocale">
+            <select class="form-select" formControlName="dateLocale">
               <option *ngFor="let lang of dateLocaleOptions" [ngValue]="lang.code">{{lang.name}}<span *ngIf="lang.code"> - {{today | customDate:'shortDate':null:lang.code}}</span></option>
             </select>
 
@@ -68,7 +68,7 @@
           </div>
           <div class="col">
 
-            <select class="form-control" formControlName="documentListItemPerPage">
+            <select class="form-select" formControlName="documentListItemPerPage">
               <option [ngValue]="10">10</option>
               <option [ngValue]="25">25</option>
               <option [ngValue]="50">50</option>
diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss
index 9c6d2b1de..b7355ade9 100644
--- a/src-ui/src/theme_dark.scss
+++ b/src-ui/src/theme_dark.scss
@@ -332,6 +332,10 @@ $border-color-dark-mode: #47494f;
     }
   }
 
+  .form-select:not(.is-invalid):not(:disabled) {
+    border-color: $border-color-dark-mode;
+  }
+
   .ng-select-container,
   .ng-select.ng-select-opened > .ng-select-container,
   .ng-dropdown-panel,

From 1fd0f45a028061cb7cbbf8b740748ad97113c68f Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 1 Mar 2022 12:32:06 -0800
Subject: [PATCH 2/2] fix filterable dropdown text color when open

---
 .../filterable-dropdown/filterable-dropdown.component.scss   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss
index 23f39fad3..5d554a69d 100644
--- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss
+++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss
@@ -46,7 +46,6 @@
   }
 }
 
-
 small > svg {
   margin-top: -2px;
 }
@@ -58,3 +57,7 @@ small > svg {
     font-size: 65%;
   }
 }
+
+.show .btn-outline-primary {
+  color: #fff;
+}
\ No newline at end of file