Theme fixes

6 files changed, 28 insertions, 14 deletions

diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index add01fb71..224efbffd 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -43,6 +43,7 @@ body {
   --inputForegroundColor: #{$input-foreground-color};
   --inputBackgroundColor: #{$input-background-color};
   --inputPlaceholderColor: #{$input-placeholder-color};
+  --inputBorderColor: #{$input-border-color};
 
   --textareaForegroundColor: #{$textarea-foreground-color};
   --textareaBackgroundColor: #{$textarea-background-color};
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 688407683..eed6abe41 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -42,14 +42,12 @@
 // ---------------------------------------------------------------------------
 
 .dropdown-menu {
-  color: pvar(--mainForegroundColor);
-  background-color: pvar(--mainBackgroundColor);
-
   .dropdown-header {
     @include padding-left(1rem);
   }
 
   .dropdown-item {
+    color: pvar(--mainForegroundColor);
     padding: 3px 15px;
 
     &.active {
@@ -271,7 +269,7 @@
 }
 
 .btn-outline-secondary {
-  border-color: $input-border-color;
+  border-color: pvar(--inputBorderColor);
 
   &:focus-within,
   &:focus,
@@ -342,7 +340,6 @@
   }
 
   .form-control-clear {
-    color: rgba(0, 0, 0, 0.4);
     display: flex;
     justify-content: center;
     align-items: center;
@@ -350,9 +347,10 @@
     font-size: 14px;
     position: absolute;
     right: .5rem;
+    opacity: 0.4;
 
     &:hover {
-      color: rgba(0, 0, 0, 0.7);
+      opacity: 0.7;
       cursor: pointer;
     }
   }
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index 3e461dbef..5c6a56283 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -46,8 +46,17 @@ $dropdown-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0,
 $dropdown-border-radius: 3px;
 $dropdown-link-active-color: pvar(--mainForegroundColor);
 $dropdown-link-active-bg: pvar(--mainBackgroundHoverColor);
+$dropdown-link-hover-color: pvar(--mainForegroundColor);
+$dropdown-link-hover-bg: pvar(--mainBackgroundHoverColor);
+$dropdown-color: pvar(--mainForegroundColor);
+$dropdown-bg: pvar(--mainBackgroundColor);
 
+$accordion-color: pvar(--mainForegroundColor);
+$accordion-bg: pvar(--mainBackgroundColor);
 $accordion-button-active-bg: pvar(--mainColorVeryLight);
 $accordion-button-active-color: pvar(--mainForegroundColor);
 $accordion-button-focus-border-color: pvar(--mainColorLightest);
 $accordion-button-focus-box-shadow: 0 0 0 .15rem pvar(--mainColorLightest);
+$accordion-border-color: pvar(--inputBorderColor);
+
+$input-group-addon-color: pvar(--mainForegroundColor);
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 1b460b723..6b93a5728 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -92,7 +92,7 @@
   max-width: $width;
   color: pvar(--inputForegroundColor);
   background-color: pvar(--inputBackgroundColor);
-  border: 1px solid $input-border-color;
+  border: 1px solid pvar(--inputBorderColor);
   border-radius: 3px;
   font-size: $form-input-font-size;
   line-height: $form-input-line-height;
@@ -138,7 +138,7 @@
   &.disabled {
     cursor: default;
     color: #fff;
-    background-color: $input-border-color;
+    background-color: pvar(--inputBorderColor);
   }
 
   my-global-icon {
@@ -168,7 +168,7 @@
   &.disabled {
     cursor: default;
     color: pvar(--mainColor);
-    background-color: $input-border-color;
+    background-color: pvar(--inputBorderColor);
   }
 
   my-global-icon {
@@ -393,7 +393,7 @@
   select {
     padding: 0 35px 0 12px;
     position: relative;
-    border: 1px solid $input-border-color;
+    border: 1px solid pvar(--inputBorderColor);
     background: transparent none;
     appearance: none;
     height: $button-height;
@@ -461,7 +461,7 @@
     top: 0;
     width: 18px;
     height: 18px;
-    border: 1px solid $input-border-color;
+    border: 1px solid pvar(--inputBorderColor);
     border-radius: 100%;
     background: #fff;
   }
@@ -508,7 +508,7 @@
     width: 18px;
     min-width: 18px;
     height: 18px;
-    border: $border-width solid $input-border-color;
+    border: $border-width solid pvar(--inputBorderColor);
     border-radius: 3px;
     vertical-align: middle;
     cursor: pointer;
@@ -601,7 +601,7 @@
   margin-bottom: 20px;
 
   @if $separator {
-    border-bottom: 1px solid $input-border-color;
+    border-bottom: 1px solid pvar(--inputBorderColor);
   }
 
   @media screen and (max-width: $small-view) {
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 2b893a62b..225cad9c2 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -48,7 +48,6 @@ $search-input-width: 375px;
 
 $menu-background: #000;
 $menu-color: #fff;
-$menu-bottom-color: #C6C6C6;
 $menu-width: 240px;
 $menu-lateral-padding: 26px;
 
@@ -135,6 +134,7 @@ $variables: (
   --inputForegroundColor: var(--inputForegroundColor),
   --inputBackgroundColor: var(--inputBackgroundColor),
   --inputPlaceholderColor: var(--inputPlaceholderColor),
+  --inputBorderColor: var(--inputBorderColor),
 
   --textareaForegroundColor: var(--textareaForegroundColor),
   --textareaBackgroundColor: var(--textareaBackgroundColor),
diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss
index 37e7a4275..a82cdbbb9 100644
--- a/client/src/sass/primeng-custom.scss
+++ b/client/src/sass/primeng-custom.scss
@@ -623,6 +623,12 @@ p-table {
         }
       }
 
+      .p-dropdown,
+      .p-dropdown-trigger {
+        color: pvar(--mainForegroundColor);
+        background-color: pvar(--mainBackgroundColor);
+      }
+
       .p-paginator-current {
         position: absolute;
         right: 0;