Skip to content

Fix bugs colors #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 6, 2021
Merged

Fix bugs colors #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9499b4
Fixed focus input olors
Mar 31, 2021
a656f9c
Removed focus from chip
Mar 31, 2021
31b5bef
Added focus to calendar icon from date
Mar 31, 2021
3f6e253
Fixed bug tokens progressBar
Mar 31, 2021
ce063d6
Fixed bug tokens invalid and required textarea
Mar 31, 2021
edce9cc
Fixed colors invalid input
Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions projects/dxc-ngx-cdk/src/lib/dxc-chip/dxc-chip.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,7 @@ export class DxcChipComponent implements OnChanges {
: "default"};
}
&:focus {
${!inputs.disabled
? "outline: -webkit-focus-ring-color auto 1px; outline-color: var(--chip-focusColor);"
: "outline: none;"};
outline: none;
}
}
.suffixIcon {
Expand All @@ -175,9 +173,7 @@ export class DxcChipComponent implements OnChanges {
: "default"};
}
&:focus {
${!inputs.disabled
? "outline: -webkit-focus-ring-color auto 1px; outline-color: var(--chip-focusColor);"
: "outline: none;"};
outline: none;
}
}
`;
Expand Down
4 changes: 4 additions & 0 deletions projects/dxc-ngx-cdk/src/lib/dxc-date/dxc-date.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,10 @@ export class DxcDateComponent implements OnChanges, OnInit {
&:not(.disabled) {
dxc-input-suffix-icon {
cursor: pointer !important;
&:focus {
outline: -webkit-focus-ring-color auto 1px;
outline-color: var(--date-focusColor);
}
}
}
`;
Expand Down
8 changes: 4 additions & 4 deletions projects/dxc-ngx-cdk/src/lib/dxc-progressbar/dxc-progressbar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
position: fixed;
opacity: 0.8;
transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
background-color: var(--progressbar-overlayColor);
background-color: var(--progressBar-overlayColor);
}
.overlayed {
height: 100%;
Expand All @@ -51,7 +51,7 @@
z-index: 1;
width: auto;
.mat-progress-bar-fill::after {
background-color: var(--progressbar-trackLine);
background-color: var(--progressBar-trackLine);
}
.mat-progress-bar-background {
fill: transparent;
Expand Down Expand Up @@ -83,12 +83,12 @@
}
}
.notOverlayed {
color: var(--progressbar-fontColor);
color: var(--progressBar-fontColor);
}
mat-progress-bar {
::ng-deep {
.mat-progress-bar-buffer {
background-color: var(--progressbar-totalLine);
background-color: var(--progressBar-totalLine);
}
}
}
Expand Down
18 changes: 13 additions & 5 deletions projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,14 @@ export class DxcTextInputComponent
fill: var(--inputText-disabledFontColor);
}
}
.mat-form-field.mat-focused .mat-form-field-label {
color: var(--inputText-focusColor) !important;
}
.mat-form-field.mat-focused .mat-form-field-ripple {
background-color: ${this.invalid
? "var(--inputText-error) !important"
: "var(--inputText-focusColor) !important"};
}
.mat-form-field {
line-height: unset;
width: 100%;
Expand All @@ -355,7 +363,7 @@ export class DxcTextInputComponent
color: var(--inputText-disabledFontColor);
}
.mat-form-field-underline {
background-color: var(--inputText-disabledFontColor);
background-color: var(--inputText-disabledFontColor) !important;
}
.mat-form-field-empty mat-label {
color: var(--inputText-disabledFontColor);
Expand Down Expand Up @@ -389,7 +397,7 @@ export class DxcTextInputComponent
color: var(--inputText-fontColor);
}
.mat-form-field-underline {
background-color: var(--inputText-fontColor);
background-color: var(--inputText-fontColor) !important;
}
`}
.mat-form-field {
Expand Down Expand Up @@ -438,14 +446,14 @@ export class DxcTextInputComponent
background-color: var(--inputText-error) !important;
}
.mat-form-field-underline {
background-color: var(--inputText-error);
background-color: var(--inputText-fontColor) !important;
&:focus {
outline: -webkit-focus-ring-color auto 1px;
outline-color: var(--inputText-error);
}
}
.mat-form-field-empty mat-label {
color: var(--inputText-fontColor);
.mat-form-field.mat-form-field-should-float mat-label {
color: var(--inputText-error) !important;
}
&.mat-focused .mat-form-field-empty mat-label {
color: var(--inputText-error);
Expand Down
2 changes: 1 addition & 1 deletion projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<mat-form-field
[class.invalid]="invalid"
[class.disabled]="disabled"
[class.invalid]="invalid"
[class.required]="required"
appearance="standard"
>
<mat-label *ngIf="label">{{ label }}</mat-label>
Expand Down
34 changes: 32 additions & 2 deletions projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class DxcTextareaComponent
@HostBinding("class") className;
@HostBinding("class.disabled") isDisabled: boolean = false;
@HostBinding("class.invalid") isInvalid: boolean = false;
@HostBinding("class.required") isRequired: boolean = false;

@Input() public value: string;
@Input() public label: String;
Expand Down Expand Up @@ -123,6 +124,7 @@ export class DxcTextareaComponent
public ngOnChanges(changes: SimpleChanges): void {
this.isDisabled = this.disabled;
this.isInvalid = this.invalid;
this.isRequired = this.required;

this.renderedValue = this.value || "";
this.label = this.label || "";
Expand Down Expand Up @@ -241,12 +243,34 @@ export class DxcTextareaComponent
input::placeholder {
color: var(--textarea-placeholderColor);
}
&.required {
.mat-hint {
color: var(--textarea-fontColor);
}
.mat-form-field-underline {
background-color: var(--textarea-fontColor);
}
label.mat-form-field-label {
color: var(--textarea-fontColor);
}
input::placeholder {
color: var(--textarea-placeholderColor);
}
.mat-form-field-ripple{
background-color: var(--textarea-fontColor);
}
.mat-input-element{
caret-color: var(--textarea-fontColor);
}
.mat-form-field-required-marker{
color: var(--textarea-error) !important;
}
}
&.invalid {
.mat-hint {
color: var(--textarea-error);
}
.mat-form-field-underline {
background-color: var(--textarea-error);
.mat-form-field-ripple {
background-color: var(--textarea-error);
}
Expand All @@ -260,13 +284,19 @@ export class DxcTextareaComponent
.mat-form-field-label:not(.mat-form-field-empty) mat-label {
color: var(--textarea-error);
}
.mat-label{
color: var(--textarea-error) !important;
}
.mat-form-field {
&.mat-form-field-should-float {
mat-label {
color: var(--textarea-error);
}
}
}
label.mat-form-field-label {
color: var(--textarea-error);
}
}
.mat-form-field {
&.mat-form-field-should-float {
Expand All @@ -284,7 +314,7 @@ export class DxcTextareaComponent
justify-content: flex-end;
display: flex;
span {
color: var(--textarea-error);
color: var(--textarea-fontColor);
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions projects/dxc-ngx-cdk/src/lib/theme/componentTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ export const componentTokens = {
"--chip-backgroundColor": globalTokens.darkWhite,
"--chip-outlinedColor": "",
"--chip-fontColor": globalTokens.black,
"--chip-focusColor": globalTokens.blue, //no esta en react
"--chip-disabledBackgroundColor": globalTokens.mediumWhite,
"--chip-disabledFontColor": globalTokens.lighterBlack,

Expand Down Expand Up @@ -165,7 +164,7 @@ export const componentTokens = {
"--inputText-selectedOptionBackgroundColor": globalTokens.lightGrey,
"--inputText-placeholderColor": globalTokens.lightGrey,
"--inputText-error": globalTokens.darkRed,
"--inputText-focusColor": globalTokens.blue,
"--inputText-focusColor": globalTokens.black,
"--inputText-fontColor": globalTokens.black,
"--inputText-scrollBarThumbColor": globalTokens.darkGrey,
"--inputText-scrollBarTrackColor": globalTokens.lightGrey,
Expand Down Expand Up @@ -201,7 +200,7 @@ export const componentTokens = {
"--select-selectedOptionBackgroundColor": globalTokens.lightGrey,
"--select-color": globalTokens.black,
"--select-error": globalTokens.darkRed,
"--select-focusColor": globalTokens.blue,
"--select-focusColor": globalTokens.black,
"--select-disabledColor": globalTokens.lighterBlack,
"--select-scrollBarThumbColor": globalTokens.darkGrey,
"--select-scrollBarTrackColor": globalTokens.lightGrey,
Expand Down