Merge #17665 - Fix #17553 - [Metro] Unreadable links and UI fixes/improvements

Pull-request: #17665
Fixes: #17553

Signed-off-by: William Desportes <williamdes@wdes.fr>

5 files changed, 57 insertions, 5 deletions

diff --git a/themes/metro/img/b_deltbl_white.png b/themes/metro/img/b_deltbl_white.png
new file mode 100644
index 0000000000..8f5b30a45c
--- /dev/null
+++ b/themes/metro/img/b_deltbl_white.png
diff --git a/themes/metro/scss/_alert.scss b/themes/metro/scss/_alert.scss
index d348396831..99166150bc 100644
--- a/themes/metro/scss/_alert.scss
+++ b/themes/metro/scss/_alert.scss
@@ -24,6 +24,20 @@
   }
 }
 
+.alert-info {
+  color: $button-color;
+  background-color: $navi-background-light;
+  background-image: none;
+
+  a {
+    color: $button-color;
+  }
+
+  h1 {
+    color: $navi-color;
+  }
+}
+
 .alert-success {
   color: $button-color;
   background-color: $browse-success-color;
diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
index 48f8654c92..63c46c8dd8 100644
--- a/themes/metro/scss/_common.scss
+++ b/themes/metro/scss/_common.scss
@@ -104,10 +104,10 @@ body#loginform {
 
   select {
     margin: 0 !important;
-    border: 1px solid $navi-background;
-    background: $navi-background;
-    color: $navi-color;
-    padding-left: 0 !important;
+    border: 1px solid #ccc;
+    background: white;
+    color: #333;
+    padding-left: 5px;
     font-family: $font-family-base;
     min-width: 100%;
 
@@ -124,6 +124,10 @@ body#loginform {
     padding-top: 0;
     padding-left: 0;
     padding-right: 0;
+
+    a {
+      color: white;
+    }
   }
 
   .card,
@@ -263,6 +267,38 @@ button:not(.accordion-button) {
   color: $button-color;
   text-decoration: none;
   background-color: $button-background;
+
+  &:hover {
+    background-color: $button-hover;
+    color: white;
+    text-decoration: none;
+  }
+}
+
+button.jsAccountLocking {
+  background: none;
+  color: var(--bs-link-color);
+  margin-left: 0;
+
+  &:hover {
+    background: none;
+    color: var(--bs-link-color);
+    text-decoration: underline;
+  }
+}
+
+button.jsPrintButton {
+  background: none;
+  color: #444;
+  margin-left: 0;
+  padding: var(--bs-btn-padding-y) var(--bs-btn-padding-x);
+
+  &:hover {
+    background: none;
+    color: #444;
+    text-decoration: none;
+    border: 1px solid #444;
+  }
 }
 
 textarea {
diff --git a/themes/metro/scss/_icons.scss b/themes/metro/scss/_icons.scss
index 50a7bc4fb2..d3363841f4 100644
--- a/themes/metro/scss/_icons.scss
+++ b/themes/metro/scss/_icons.scss
@@ -160,7 +160,7 @@
 }
 
 .ic_db_drop {
-  background-image: url('../img/b_deltbl.png');
+  background-image: url('../img/b_deltbl_white.png');
 }
 
 .ic_b_newtbl {
diff --git a/themes/metro/scss/_navigation.scss b/themes/metro/scss/_navigation.scss
index 27a3500710..0953d586a5 100644
--- a/themes/metro/scss/_navigation.scss
+++ b/themes/metro/scss/_navigation.scss
@@ -475,11 +475,13 @@ li.fast_filter {
     border: 1px solid #ddd;
     background: #f2f2f2;
     cursor: pointer;
+    color: #333;
   }
 
   .drop_list {
     &:hover .drop_button {
       background: #fff;
+      color: #333;
     }
 
     ul {