Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions src/components/combo/themes/shared/combo.bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ $dropdown-theme: dropdown-theme.$bootstrap;
grid-auto-rows: minmax(rem(20px), auto);
margin-block-start: rem(4px);
}

::slotted([slot='suffix']),
::slotted([slot='prefix']) {
height: 100%;
display: flex;
align-items: center;
}
}

[part='list-wrapper'] {
Expand Down Expand Up @@ -128,4 +135,25 @@ $dropdown-theme: dropdown-theme.$bootstrap;
color: inherit;
}
}

::slotted([slot='suffix']),
[part|='toggle'] {
border-inline-end: rem(1px) solid var(--disabled-border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--disabled-border-color);
}
}

:host(:not([disabled])),
:host(:not(:disabled)) {
::slotted([slot='suffix']),
[part|='toggle'] {
border-inline-end: rem(1px) solid var(--border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--border-color);
}
}
5 changes: 5 additions & 0 deletions src/components/combo/themes/shared/combo.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,8 @@ $dropdown-theme: dropdown-theme.$material;
}
}
}

::slotted([slot='suffix']),
::slotted([slot='prefix']) {
padding-inline: var(--affix-padding);
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,29 @@ $theme: $bootstrap;
[part='actions'] {
min-height: #{sizable(rem(47px), rem(54px), rem(64px))};
}

:host(:not([disabled])),
:host(:not(:disabled)) {
::slotted([slot^='prefix-']),
[part|='calendar-icon'] {
border-inline-start: rem(1px) solid var(--border-color);
}

::slotted([slot^='suffix-']),
[part|='clear-icon'] {
border-inline-end: rem(1px) solid var(--border-color);
}
}

:host(:disabled),
:host([disabled]) {
::slotted([slot^='prefix-']),
[part|='calendar-icon'] {
border-inline-start: rem(1px) solid var(--disabled-border-color);
}

::slotted([slot^='suffix-']),
[part|='clear-icon'] {
border-inline-end: rem(1px) solid var(--disabled-border-color);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,8 @@ igc-icon,
::slotted(igc-icon) {
--component-size: var(--input-size);
}

::slotted([slot|='suffix']),
::slotted([slot|='prefix']) {
padding-inline: var(--affix-padding);
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@ $theme-file-input: file-input.$bootstrap;
[part~='file-names'] {
border-color: var-get($theme, 'error-secondary-color');
}

[part~='prefixed'] ::slotted([slot='prefix']) {
border-inline-start-color: var(--error-secondary-color);
}

[part~='suffixed'] ::slotted([slot='suffix']) {
border-inline-end-color: var(--error-secondary-color);
}
}

:host(:not([disabled]):state(ig-invalid):focus-within) {
Expand Down
32 changes: 31 additions & 1 deletion src/components/input/themes/shared/input.bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $theme: $bootstrap;
--input-font: #{sizable(rem(16px), rem(16px), rem(20px))};
--input-border-color: #{var-get($theme, 'border-color')};
--input-height: #{var-get($theme, 'size')};
--affix-padding: #{pad-inline(rem(8px), rem(12px), rem(14px))};

::part(helper-text) {
@include type-style('body-2');
Expand All @@ -18,6 +19,14 @@ $theme: $bootstrap;
grid-auto-rows: minmax(rem(20px), auto);
margin-block-start: rem(4px);
}

[part='prefix'] {
border-inline-start-width: 0;
}

[part='suffix'] {
border-inline-end-width: 0;
}
}

[part~='container'] {
Expand Down Expand Up @@ -87,7 +96,6 @@ $theme: $bootstrap;
align-items: center;
width: max-content;
height: 100%;
padding-inline: pad-inline(8px, 12px, 16px);
}

[part='prefix'],
Expand Down Expand Up @@ -211,3 +219,25 @@ $theme: $bootstrap;
color: var-get($theme, 'disabled-text-color');
}
}

:host(:not(:disabled, [role='combobox'])),
:host(:not([disabled], [role='combobox'])) {
::slotted([slot='suffix']) {
border-inline-end: rem(1px) solid var(--border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--border-color);
}
}

:host(:disabled:not([role='combobox'])),
:host([disabled]:not([role='combobox'])) {
::slotted([slot='suffix']) {
border-inline-end: rem(1px) solid var(--disabled-border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--disabled-border-color);
}
}
11 changes: 11 additions & 0 deletions src/components/input/themes/shared/input.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,14 @@ $theme: $base;
::part(helper-text) {
display: grid;
}

[name='suffix']::slotted(:is([part|='toggle'], [part|='clear'])) {
padding-inline: var(--affix-padding);
}

:host(:not([role='combobox'])) {
::slotted([slot='suffix']),
::slotted([slot='prefix']) {
padding-inline: var(--affix-padding);
}
}
2 changes: 1 addition & 1 deletion src/components/input/themes/shared/input.fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $theme: $fluent;
--input-size: var(--component-size);
--helper-text-top-spacer: rem(5px);
--input-border-size: #{rem(1px)};
--affix-padding: #{pad-inline(rem(8px), rem(12px), rem(16px))};

[part='prefix'],
[part='suffix'] {
Expand All @@ -34,7 +35,6 @@ $theme: $fluent;
align-items: center;
width: max-content;
height: 100%;
padding-inline: pad-inline(8px, 12px, 16px);
}

[part='prefix'] {
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/themes/shared/input.indigo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ $transition-duration: .25s;
width: max-content;
align-items: center;
height: calc(100% - #{rem(1px)});
padding-inline: pad-inline(2px, 4px, 6px);
}

:host {
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--input-size: var(--component-size);
--input-icon: #{sizable(rem(14px), rem(16px), rem(18px))};
--affix-padding: #{pad-inline(rem(2px), rem(4px), rem(6px))};

::slotted(igc-icon) {
--size: var(--input-icon) !important;
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/themes/shared/input.material.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ $fs: rem(16px) !default;
align-items: center;
width: max-content;
height: 100%;
padding-inline: pad-inline(rem(12px), rem(14px), rem(16px));
}

:host {
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--input-size: var(--component-size);
--affix-padding: #{pad-inline(rem(12px), rem(14px), rem(16px))};

input:placeholder-shown + [part='notch'] {
@extend %floated-styles;
Expand Down
28 changes: 28 additions & 0 deletions src/components/select/themes/shared/select.bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ $input-theme: input-theme.$bootstrap;
grid-auto-rows: minmax(rem(20px), auto);
margin-block-start: rem(4px);
}

::slotted([slot='suffix']),
::slotted([slot='prefix']) {
height: 100%;
display: flex;
align-items: center;
}
}

[part='base'] {
Expand Down Expand Up @@ -45,4 +52,25 @@ $input-theme: input-theme.$bootstrap;
color: inherit;
}
}

::slotted([slot='suffix']),
[part|='toggle'] {
border-inline-end: rem(1px) solid var(--disabled-border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--disabled-border-color);
}
}

:host(:not([disabled])),
:host(:not(:disabled)) {
::slotted([slot='suffix']),
[part|='toggle'] {
border-inline-end: rem(1px) solid var(--border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--border-color);
}
}
5 changes: 5 additions & 0 deletions src/components/select/themes/shared/select.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,8 @@ $dropdown-theme: dropdown-theme.$material;
color: var-get($theme, 'error-secondary-color');
}
}

::slotted([slot='suffix']),
::slotted([slot='prefix']) {
padding-inline: var(--affix-padding);
}
35 changes: 31 additions & 4 deletions src/components/textarea/themes/shared/textarea.bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $theme: $bootstrap;
@include type-style('body-1');

--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--affix-padding: #{pad-inline(rem(10px), rem(12px), rem(12px))};

::part(helper-text) {
@include type-style('body-2');
Expand All @@ -15,6 +16,13 @@ $theme: $bootstrap;
grid-auto-rows: minmax(rem(20px), auto);
margin-block-start: rem(4px);
}

::slotted([slot="prefix"]),
::slotted([slot="suffix"]) {
height: 100%;
display: flex;
align-items: center;
}
}

[part~='label'] {
Expand All @@ -30,11 +38,11 @@ $theme: $bootstrap;

[part~='prefixed'] {
[part~='prefix'] {
border-width: rem(1px);
border-block-width: rem(1px);
border-style: solid;
border-color: var-get($theme, 'border-color');
overflow: hidden;
border-inline-end-width: 0;
border-inline-width: 0;
border: {
start: {
start-radius: var-get($theme, 'border-border-radius');
Expand All @@ -59,11 +67,11 @@ $theme: $bootstrap;

[part~='suffixed'] {
[part~='suffix'] {
border-width: rem(1px);
border-block-width: rem(1px);
border-style: solid;
border-color: var-get($theme, 'border-color');
overflow: hidden;
border-inline-start-width: 0;
border-inline-width: 0;
border: {
start: {
end-radius: var-get($theme, 'border-border-radius');
Expand Down Expand Up @@ -157,4 +165,23 @@ textarea {
border: rem(1px) solid var-get($theme, 'disabled-border-color');
box-shadow: none;
}

::slotted([slot='suffix']) {
border-inline-end: rem(1px) solid var(--disabled-border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--disabled-border-color);
}
}

:host(:not([disabled])),
:host(:not(:disabled)) {
::slotted([slot='suffix']) {
border-inline-end: rem(1px) solid var(--border-color);
}

::slotted([slot='prefix']) {
border-inline-start: rem(1px) solid var(--border-color);
}
}
5 changes: 5 additions & 0 deletions src/components/textarea/themes/shared/textarea.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,8 @@ textarea {
color: var-get($theme, 'disabled-text-color');
}
}

::slotted([slot='suffix']),
::slotted([slot='prefix']) {
padding-inline: var(--affix-padding);
}
1 change: 1 addition & 0 deletions src/components/textarea/themes/shared/textarea.fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $border-size: rem(1px);

--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--textarea-border-size: #{rem(1px)};
--affix-padding: #{pad-inline(rem(8px), rem(12px), rem(16px))};

::part(helper-text) {
@include type-style('caption');
Expand Down
6 changes: 1 addition & 5 deletions src/components/textarea/themes/shared/textarea.indigo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $theme: $indigo;

--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--input-icon: #{sizable(rem(14px), rem(16px), rem(18px))};
--affix-padding: #{pad-inline(rem(2px), rem(4px), rem(6px))};

::slotted(igc-icon) {
--size: var(--input-icon) !important;
Expand Down Expand Up @@ -106,11 +107,6 @@ textarea {
}
}

[part~='prefixed'] [part='prefix'],
[part~='suffixed'] [part='suffix'] {
padding-inline: pad-inline(rem(2px), rem(4px), rem(6px));
}

[part~='prefixed'] textarea {
padding-inline-start: 0;
}
Expand Down
Loading