Skip to content

[Patch] Fix #369 Input text underline #390

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
mawelCaballero merged 1 commit into from
Jun 22, 2021
Merged

[Patch] Fix #369 Input text underline #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
</div>
<div class="mat-select-arrow-wrapper"><div class="mat-select-arrow"></div></div>
</div>
<div class="underline"></div>
<span class="assistiveText">{{assistiveText}}</span>

<ng-template
Expand Down
41 changes: 32 additions & 9 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,9 @@ export abstract class _MatSelectBase<C>
getDynamicStyle() {
return css`
.mat-select-arrow-wrapper {
${this.panelOpen ? "transform: rotate(180deg)" : "transform: rotate(0deg)"};
${this.panelOpen
? "transform: rotate(180deg)"
: "transform: rotate(0deg)"};
}
${this.utils.getMargins(this.margin)}
&.mat-select {
Expand All @@ -1308,12 +1310,6 @@ export abstract class _MatSelectBase<C>
height: 66.5px;
position: relative;

.assistiveText {
font-size: 12px;
font-family: var(--fontFamily);
color: ${this.invalid ? "var(--select-error)" : "var(--select-color)"};
}

.selectLabel {
position: absolute;
width: calc(100% - 24px);
Expand Down Expand Up @@ -1356,20 +1352,47 @@ export abstract class _MatSelectBase<C>
border-top-width: 0.84375em;
border-top-style: solid;
border-top-color: transparent;
border-bottom: 1px solid var(--select-color);
:focus {
outline: -webkit-focus-ring-color auto 1px;
outline-color: var(--select-focusColor);
}
}

.underline {
height: ${this.value ? "1.2px" : "1px"};
background-color: var(--select-color);
position: absolute;
bottom: ${this.value ? "19.5px" : "18.5px"};
width: 100%;
}

.assistiveText {
font-size: 12px;
font-family: var(--fontFamily);
color: ${this.invalid ? "var(--select-error)" : "var(--select-color)"};

position: absolute;
width: 100%;
bottom: -3px;
left: 0px;
margin-top: 6px;
}

${this.disabled
? `cursor: not-allowed;
.mat-select-trigger {
cursor: not-allowed;
border-bottom: 1px solid var(--select-disabledColor) !important;
outline: none !important;
}

.underline {
height: 1px;
background-color: var(--select-disabledColor);
position: absolute;
bottom: ${this.value ? "19.5px" : "18.5px"};
width: 100%;
}

.assistiveText {
color: var(--select-disabledColor) !important;
}
Expand Down
8 changes: 8 additions & 0 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 @@ -380,6 +380,8 @@ export class DxcTextInputComponent
}
.onClickIconElement {
cursor: pointer !important;
height: 20px;
width: 20px;
.containerIcon {
&:focus {
outline: -webkit-focus-ring-color auto 1px !important;
Expand Down Expand Up @@ -441,6 +443,8 @@ export class DxcTextInputComponent
}
.mat-form-field-underline {
background-color: var(--inputText-disabledFontColor) !important;
bottom: unset;
transform: none;
}
.mat-form-field-empty mat-label {
color: var(--inputText-disabledFontColor);
Expand Down Expand Up @@ -474,6 +478,8 @@ export class DxcTextInputComponent
color: var(--inputText-fontColor);
}
.mat-form-field-underline {
bottom: unset;
transform: none;
background-color: var(--inputText-fontColor) !important;
.mat-form-field-ripple {
background-color: var(--inputText-fontColor) !important;
Expand Down Expand Up @@ -528,6 +534,8 @@ export class DxcTextInputComponent
height: 0px !important;
}
.mat-form-field-underline {
bottom: unset;
transform: none;
background-color: var(--inputText-fontColor) !important;
&:focus {
outline: -webkit-focus-ring-color auto 1px;
Expand Down