diff --git a/src/assets/styles/common-breadcrumbs.scss b/src/assets/styles/common-breadcrumbs.scss index 7df17fb..da9655d 100644 --- a/src/assets/styles/common-breadcrumbs.scss +++ b/src/assets/styles/common-breadcrumbs.scss @@ -13,13 +13,13 @@ min-width: 16px; } - .dropdown-breadcrumb { + .dropdown-breadcrumb .mdc-button { font-weight: 600; - color: var(--iqser-primary); + --mdc-text-button-label-text-color: var(--iqser-primary); + } - &[aria-expanded='true'] .mat-button-wrapper > span { - color: var(--iqser-text); - } + .dropdown-breadcrumb[aria-expanded='true'] .mdc-button { + --mdc-text-button-label-text-color: var(--iqser-text); } } diff --git a/src/assets/styles/common-buttons.scss b/src/assets/styles/common-buttons.scss index b26a9fc..926cd36 100644 --- a/src/assets/styles/common-buttons.scss +++ b/src/assets/styles/common-buttons.scss @@ -64,11 +64,11 @@ iqser-icon-button { .mdc-button.mat-mdc-button { @include iconSize14; - --mdc-text-button-label-text-color: var(--iqser-accent); + --mdc-text-button-label-text-color: var(--iqser-text); padding: 0 14px; &[disabled] { - --mdc-text-button-disabled-label-text-color: rgba(var(--iqser-accent-rgb), 0.3); + --mdc-text-button-disabled-label-text-color: rgba(var(--iqser-text-rgb), 0.3); } .mat-icon { @@ -161,7 +161,7 @@ iqser-chevron-button { @include iconSize14; &:not([disabled]) { - --mdc-text-button-label-text-color: var(--iqser-accent); + --mdc-text-button-label-text-color: var(--iqser-text); } } } @@ -173,7 +173,9 @@ iqser-user-button { display: block; - .mat-mdc-button { + .mdc-button.mat-mdc-button { + --mdc-text-button-label-text-color: var(--iqser-text); + @include iconSize14; padding: 0 10px 0 5px; } diff --git a/src/assets/styles/common-checkbox.scss b/src/assets/styles/common-checkbox.scss index a204877..ffaae5d 100644 --- a/src/assets/styles/common-checkbox.scss +++ b/src/assets/styles/common-checkbox.scss @@ -14,7 +14,6 @@ $ripple-size: 26px; --mdc-checkbox-unselected-hover-icon-color: var(--iqser-grey-5); --mdc-checkbox-unselected-pressed-icon-color: var(--iqser-grey-5); --mdc-checkbox-unselected-focus-icon-color: var(--iqser-grey-5); - --mdc-theme-text-primary-on-background: var(--iqser-text); --mdc-checkbox-disabled-selected-icon-color: var(--iqser-primary); --mdc-checkbox-disabled-unselected-icon-color: var(--iqser-grey-5); diff --git a/src/assets/styles/common-dialogs.scss b/src/assets/styles/common-dialogs.scss index 22d07cb..f735ee9 100644 --- a/src/assets/styles/common-dialogs.scss +++ b/src/assets/styles/common-dialogs.scss @@ -1,10 +1,10 @@ @use 'common-mixins'; .mat-mdc-dialog-container .mdc-dialog__surface { + --mdc-dialog-container-color: var(--iqser-background); display: flex !important; flex-direction: row; color: var(--iqser-text); - background-color: var(--iqser-background); padding: 0 !important; border-radius: 8px !important; @include common-mixins.scroll-bar; diff --git a/src/assets/styles/common-inputs.scss b/src/assets/styles/common-inputs.scss index 09eff2e..0137a19 100644 --- a/src/assets/styles/common-inputs.scss +++ b/src/assets/styles/common-inputs.scss @@ -113,10 +113,19 @@ iqser-dynamic-input { display: none; } - .mdc-notched-outline__leading, - .mdc-notched-outline__trailing { - --mdc-shape-small: 8px; // border-radius - border-color: var(--iqser-inputs-outline); + .mdc-text-field--outlined:not(.mdc-text-field--disabled):not(.mdc-text-field--focused) { + .mdc-notched-outline__leading, + .mdc-notched-outline__trailing { + --mdc-shape-small: 8px; // border-radius + border-color: var(--iqser-inputs-outline); + } + + &:hover { + .mdc-notched-outline__leading, + .mdc-notched-outline__trailing { + border-color: var(--iqser-inputs-outline); + } + } } .mdc-text-field--focused .mdc-notched-outline__leading, diff --git a/src/assets/styles/common-menu.scss b/src/assets/styles/common-menu.scss index dd26816..69b8823 100644 --- a/src/assets/styles/common-menu.scss +++ b/src/assets/styles/common-menu.scss @@ -5,7 +5,6 @@ max-width: none !important; min-width: 180px !important; margin-top: var(--iqser-menu-margin-top); - background-color: var(--iqser-popup-background); min-height: unset !important; @include common-mixins.scroll-bar; @include common-mixins.drop-shadow; @@ -36,6 +35,7 @@ mat-icon { color: var(--iqser-text); + width: 14px; } .dot { @@ -77,13 +77,17 @@ } &.active { - font-weight: 600; + > span { + font-weight: 600; + } + padding-right: 8px; justify-content: space-between; .checkmark { display: flex; margin-left: 16px; + order: 1; } } } diff --git a/src/assets/styles/common-select.scss b/src/assets/styles/common-select.scss index c5c2091..396fa7f 100644 --- a/src/assets/styles/common-select.scss +++ b/src/assets/styles/common-select.scss @@ -37,3 +37,7 @@ color: rgba(var(--iqser-text-rgb), 0.7); } } + +.mat-mdc-select-value { + color: var(--iqser-text); +} diff --git a/src/lib/buttons/chevron-button/chevron-button.component.ts b/src/lib/buttons/chevron-button/chevron-button.component.ts index 4f6f789..1014673 100644 --- a/src/lib/buttons/chevron-button/chevron-button.component.ts +++ b/src/lib/buttons/chevron-button/chevron-button.component.ts @@ -5,7 +5,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; @Component({ - selector: 'iqser-chevron-button [label]', + selector: 'iqser-chevron-button', templateUrl: './chevron-button.component.html', styleUrls: ['./chevron-button.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, @@ -13,7 +13,7 @@ import { MatIconModule } from '@angular/material/icon'; imports: [NgIf, MatIconModule, MatButtonModule], }) export class ChevronButtonComponent { - @Input() label!: string; + @Input({ required: true }) label!: string; @Input() showDot = false; @Input() primary = false; @Input() disabled = false;