Skip to content

refactor(input): use border instead of box-shadow #11273

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 7 commits into from
Mar 24, 2022
Merged

refactor(input): use border instead of box-shadow #11273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71d04ef
refactor(input): use border instead of box-shadow
SisIvanova Mar 23, 2022
86457ad
improve prefix & suffix padding
SisIvanova Mar 23, 2022
37fa838
fix lint errors
SisIvanova Mar 24, 2022
e077009
fix indigo error hover
SisIvanova Mar 24, 2022
b9ee734
use ::after pseudo-element
SisIvanova Mar 24, 2022
bf6d296
Merge branch '13.1.x' into sivanova/fluent-input
simeonoff Mar 24, 2022
3ba6b6e
Merge branch '13.1.x' into sivanova/fluent-input
simeonoff Mar 24, 2022
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
37 changes: 21 additions & 16 deletions projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,10 @@
&:hover {
@extend %form-group-bundle--fluent--hover !optional;
}

&:focus-within {
@extend %form-group-bundle--fluent--focus !optional;
}
}

@include e(bundle-main) {
Expand Down Expand Up @@ -565,24 +569,24 @@
@extend %fluent-input-disabled !optional;

&:hover {
@extend %fluent-input-disabled !optional
}
@extend %fluent-input-disabled !optional;
}

&:focus {
@extend %fluent-input-disabled !optional
}
@extend %fluent-input-disabled !optional;
}
}

@include e(file-input) {
@extend %fluent-input-disabled !optional;

&:hover {
@extend %fluent-input-disabled !optional
}
@extend %fluent-input-disabled !optional;
}

&:focus {
@extend %fluent-input-disabled !optional
}
@extend %fluent-input-disabled !optional;
}
}

@include e(label) {
Expand All @@ -605,11 +609,6 @@
@include mx(focused, fluent) {
@include e(bundle) {
@extend %form-group-bundle--focus !optional;

&:focus-within,
&:hover {
@extend %form-group-bundle--fluent--focus !optional;
}
}

@include e(label) {
Expand All @@ -627,10 +626,13 @@
@include e(bundle) {
@extend %form-group-bundle-success--fluent !optional;

&:focus-within,
&:hover {
@extend %form-group-bundle-success--fluent--hover !optional;
}

&:focus-within {
@extend %form-group-bundle-success--fluent--focus !optional;
}
}

@include e(label) {
Expand All @@ -642,10 +644,13 @@
@include e(bundle) {
@extend %form-group-bundle-error--fluent !optional;

&:focus-within,
&:hover {
@extend %form-group-bundle-error--fluent--hover !optional;
}

&:focus-within {
@extend %form-group-bundle-error--fluent--focus !optional;
}
}

@include e(label) {
Expand Down Expand Up @@ -740,7 +745,7 @@
@extend %form-group-bundle-error--indigo !optional;

&:hover {
@extend %form-group-bundle-error--fluent--hover !optional;
@extend %form-group-bundle-error--indigo--hover !optional;
}
}
}
Expand Down
41 changes: 30 additions & 11 deletions projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,11 @@
box-shadow: inset 0 -2px 0 0 var-get($theme, 'error-secondary-color');
}

%form-group-bundle-error--indigo--hover {
border-color: var-get($theme, 'error-secondary-color');
box-shadow: 0 0 0 1px var-get($theme, 'error-secondary-color');
}

%form-group-helper--indigo--disabled {
color: var-get($theme, 'disabled-text-color');
}
Expand Down Expand Up @@ -728,7 +733,7 @@
}

%form-group-bundle-required--fluent {
&::after {
&::before {
content: '*';
position: absolute;
top: rem(-8px);
Expand All @@ -738,7 +743,7 @@
}

%fluent-label + %form-group-bundle-required--fluent {
&::after {
&::before {
display: none;
}
}
Expand All @@ -763,7 +768,15 @@
%form-group-bundle--fluent--focus {
caret-color: var-get($theme, 'focused-text-color');
border-color: var-get($theme, 'focused-border-color');
box-shadow: 0 0 0 1px var-get($theme, 'focused-border-color');

&::after {
pointer-events: none;
position: absolute;
content: '';
width: 100%;
height: 100%;
border: rem(1px) solid var-get($theme, 'focused-border-color');
}
}

%form-group-bundle--fluent--hover-disabled,
Expand All @@ -772,22 +785,28 @@
background: var-get($theme, 'border-disabled-background');
}

%form-group-bundle-error--fluent,
%form-group-bundle-error--fluent--hover,
%form-group-bundle-error--fluent {
%form-group-bundle-error--fluent--focus {
border-color: var-get($theme, 'error-secondary-color');
}

%form-group-bundle-error--fluent--hover {
box-shadow: 0 0 0 1px var-get($theme, 'error-secondary-color');
}

%form-group-bundle-success--fluent,
%form-group-bundle-success--fluent--hover,
%form-group-bundle-success--fluent {
%form-group-bundle-success--fluent--focus {
border-color: var-get($theme, 'success-secondary-color');
}

%form-group-bundle-success--fluent--hover {
box-shadow: 0 0 0 1px var-get($theme, 'success-secondary-color');
%form-group-bundle-success--fluent--focus {
&::after {
border: rem(1px) solid var-get($theme, 'success-secondary-color');
}
}

%form-group-bundle-error--fluent--focus {
&::after {
border: rem(1px) solid var-get($theme, 'error-secondary-color');
}
}

%fluent-input {
Expand Down
4 changes: 2 additions & 2 deletions projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_input-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ $light-input-group: extend(
/// @prop {Map} hover-border-color [color: ('grays', 800)] - The hover input border for input groups of type border and fluent.
/// @prop {Map} disabled-border-color [color: ('grays', 100)] - The disabled border color for input groups of type border and fluent.
///
/// @prop {Map} focused-border-color [color: ('info')] - The focused input border color for input groups of type border and fluent.
/// @prop {Map} focused-border-color [color: ('primary', 500)] - The focused input border color for input groups of type border and fluent.
/// @prop {Map} border-disabled-background [color: ('grays', 100)] - The background color of an input group of type border in the disabled state.
///
/// @prop {Color} search-disabled-background [color: ('grays', 100)] - The background color of an input group of type search in the disabled state.
Expand Down Expand Up @@ -241,7 +241,7 @@ $fluent-input-group: extend(
),

focused-border-color: (
color: ('info')
color: ('primary', 500)
),

disabled-border-color: (
Expand Down