diff --git a/projects/go-lib/src/lib/components/go-card/go-card.component.scss b/projects/go-lib/src/lib/components/go-card/go-card.component.scss index de0263ce2..2280f9a71 100644 --- a/projects/go-lib/src/lib/components/go-card/go-card.component.scss +++ b/projects/go-lib/src/lib/components/go-card/go-card.component.scss @@ -28,10 +28,6 @@ &:last-child { padding-right: 0; } - - &:hover { - color: $base-primary; - } } } } diff --git a/projects/go-lib/src/lib/components/go-select/go-select.component.scss b/projects/go-lib/src/lib/components/go-select/go-select.component.scss index 51a21c914..c784ea54b 100644 --- a/projects/go-lib/src/lib/components/go-select/go-select.component.scss +++ b/projects/go-lib/src/lib/components/go-select/go-select.component.scss @@ -137,6 +137,7 @@ } .ng-dropdown-panel .ng-dropdown-panel-items .ng-option { + color: $theme-light-color; font-size: .875rem; padding: .5rem; @@ -147,6 +148,7 @@ &.ng-option-selected, &.ng-option-selected.ng-option-marked { background-color: $theme-light-bg-hover; + color: $theme-light-color; .ng-option-label { font-weight: $weight-light; @@ -176,6 +178,8 @@ body > .ng-dropdown-panel { // overrides ng-select styles when theme is dark .ng-select.go-select--dark { .ng-dropdown-panel { + box-shadow: $global-box-shadow--dark-popup; + &.ng-select-bottom { border: 0; } @@ -193,6 +197,7 @@ body > .ng-dropdown-panel { &.ng-option-selected, &.ng-option-selected.ng-option-marked { background-color: $base-dark-secondary; + color: $theme-dark-color; .ng-option-label { font-weight: $weight-light; diff --git a/projects/go-lib/src/lib/components/go-timepicker/go-time.component.html b/projects/go-lib/src/lib/components/go-timepicker/go-time.component.html index b5e8b8b2c..118ee738a 100644 --- a/projects/go-lib/src/lib/components/go-timepicker/go-time.component.html +++ b/projects/go-lib/src/lib/components/go-timepicker/go-time.component.html @@ -4,7 +4,8 @@ [ngClass]="{ 'go-time--above': displayAbove, 'go-time--right': displayFromRight, - 'go-time--append-to-content': appendToContent + 'go-time--append-to-content': appendToContent, + 'go-time--dark': theme === 'dark' }" >
@@ -47,7 +48,10 @@
- + {{ format ? 'AM' : 'PM' }}
@@ -55,7 +59,11 @@