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 @@
diff --git a/projects/go-lib/src/lib/components/go-timepicker/go-timepicker.component.ts b/projects/go-lib/src/lib/components/go-timepicker/go-timepicker.component.ts
index 2249e5d8d..692bf26c5 100644
--- a/projects/go-lib/src/lib/components/go-timepicker/go-timepicker.component.ts
+++ b/projects/go-lib/src/lib/components/go-timepicker/go-timepicker.component.ts
@@ -21,7 +21,7 @@ export class GoTimepickerComponent implements OnInit, AfterViewInit {
@Input() control: FormControl;
@Input() hints: string[];
@Input() placeholder: string = '';
- @Input() theme: string = 'light';
+ @Input() theme: 'light' | 'dark' = 'light';
@Input() appendToContent: boolean = false;
selectedTime: string = '';
diff --git a/projects/go-lib/src/styles/_forms.scss b/projects/go-lib/src/styles/_forms.scss
index d7dbac2aa..e9032f3ed 100644
--- a/projects/go-lib/src/styles/_forms.scss
+++ b/projects/go-lib/src/styles/_forms.scss
@@ -189,6 +189,7 @@ $input--disabled-background: rgba($base-dark-secondary, .4);
// Dark Overrides
// ---------------------------------------------
+ &--dark,
&--dark &__input,
&--dark &__select,
&__input--dark,
diff --git a/projects/go-lib/src/styles/_mixins.scss b/projects/go-lib/src/styles/_mixins.scss
index 2046d4bcd..577030686 100644
--- a/projects/go-lib/src/styles/_mixins.scss
+++ b/projects/go-lib/src/styles/_mixins.scss
@@ -69,6 +69,7 @@ $z-index: (
border: 1px solid lighten($theme-light-border, 13.5%);
border-radius: $global-radius;
box-shadow: none;
+ color: $theme-light-color;
font-family: $primary-font-stack;
font-size: .875rem;
font-weight: $weight-light;
diff --git a/projects/go-lib/src/styles/_typography.scss b/projects/go-lib/src/styles/_typography.scss
index f32c34041..f7a134b1a 100644
--- a/projects/go-lib/src/styles/_typography.scss
+++ b/projects/go-lib/src/styles/_typography.scss
@@ -55,6 +55,41 @@ strong {
color: $ui-color-neutral;
outline: none;
}
+
+ &--unstyled {
+ color: inherit;
+ text-decoration: none;
+
+ &:active,
+ &:focus,
+ &:hover,
+ &:visited {
+ color: inherit;
+ }
+ }
+
+ &--dark {
+ color: $theme-dark-color;
+
+ &:active,
+ &:visited {
+ color: $theme-dark-color;
+ }
+
+ &.go-link {
+ &--unstyled {
+ color: inherit;
+ text-decoration: none;
+
+ &:active,
+ &:focus,
+ &:hover,
+ &:visited {
+ color: inherit;
+ }
+ }
+ }
+ }
}
.go-ordered-list {
diff --git a/projects/go-lib/src/styles/_variables.scss b/projects/go-lib/src/styles/_variables.scss
index 898051955..c7b53c00f 100644
--- a/projects/go-lib/src/styles/_variables.scss
+++ b/projects/go-lib/src/styles/_variables.scss
@@ -13,6 +13,7 @@ $global-box-shadow--regular: 0 0 2px 0 rgba(0, 0, 0, .12), 0 3px 6px 0 rgba(0, 0
$global-box-shadow--search: 0 1px 6px 0 rgba(32, 33, 36, .28);
$global-box-shadow--large: 0 7px 14px 0 rgba(65, 54, 94, .10), 0 3px 6px 0 rgba(0, 0, 0, .07);
$global-box-shadow--small: 0 1px 2px 0 rgba(0, 0, 0, .20);
+$global-box-shadow--dark-popup: 0 2px 7px 2px rgb(0 0 0 / 22%), 0 2px 4px 0 rgb(0 0 0 / 20%);
// scss-lint:enable ColorVariable
// Structural
diff --git a/projects/go-style-guide/src/app/features/ui-kit/components/form-docs/components/forms-overview/forms-overview.component.html b/projects/go-style-guide/src/app/features/ui-kit/components/form-docs/components/forms-overview/forms-overview.component.html
index 46c5765a1..9cd680251 100644
--- a/projects/go-style-guide/src/app/features/ui-kit/components/form-docs/components/forms-overview/forms-overview.component.html
+++ b/projects/go-style-guide/src/app/features/ui-kit/components/form-docs/components/forms-overview/forms-overview.component.html
@@ -15,7 +15,7 @@