Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'material': pad-inline(rem(4px), rem(8px), rem(16px)),
'fluent': pad-inline(rem(2px), rem(4px), rem(8px)),
'bootstrap': pad-inline(rem(4px), rem(8px), rem(16px)),
'indigo': pad-inline(rem(12px))
'indigo': pad-inline(rem(8px), rem(12px), rem(12px))
), $variant);

$search-input-block-padding: map.get((
Expand Down Expand Up @@ -73,6 +73,16 @@
igx-input-group {
--theme: #{if($variant == 'indigo', 'indigo', 'material')};
--ig-size: #{if($variant == 'indigo', 2, 1)};

@if $variant == 'bootstrap' or $variant == 'indigo' {
input {
height: rem(28px);
}
} @else if $variant == 'fluent' {
input {
height: rem(32px);
}
}
}
}

Expand Down Expand Up @@ -151,6 +161,18 @@
%igx-combo__search {
--igx-input-group-input-suffix-background: transparent;
--igx-input-group-input-suffix-background--focused: transparent;

.igx-input-group__bundle::after {
border-block-end-color: var(--border-color);
}

.igx-input-group__bundle:hover::after {
border-block-end-color: #{if($variant == 'fluent', var(--hover-border-color), var(--border-color))};;
}

.igx-input-group--focused .igx-input-group__bundle::after {
border-block-end-color: var(--focused-bottom-line-color);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
}
}

igx-date-range-start,
igx-date-range-end {
min-width: 0;
}

igx-date-range-start,
igx-date-range-end,
%igx-date-range-picker__start,
Expand Down Expand Up @@ -57,18 +62,18 @@
}

/// Adds typography styles for the igx-date-range-picker component.
/// Uses the 'subtitle-1'
/// Uses the 'caption'
/// categories from the typographic scale.
/// @group typography
/// @param {Map} $categories [(label: 'subtitle-1')] - The categories from the typographic scale used for type styles.
/// @param {Map} $categories [(label: 'caption')] - The categories from the typographic scale used for type styles.
@mixin date-range-typography(
$categories: (
label: 'subtitle-1',
label: 'caption',
)
) {
$label: map.get($categories, 'label');

%igx-date-range__label {
%igx-date-range-picker__label {
@include type-style($label);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,13 @@
$indigo-theme: $variant == 'indigo';
$fluent-theme: $variant == 'fluent';
$bootstrap-theme: $variant == 'bootstrap';
$NOT-material-theme: $variant != 'material';
$NOT-indigo-theme: $variant != 'indigo';
$NOT-fluent-theme: $variant != 'fluent';
$NOT-bootstrap-theme: $variant != 'bootstrap';

$required-symbol: '*';
$required-symbol-margin: rem(2px);

// This creates an inverse relationship
// between the value of the base scale size and
// the sizing of all inner elements.
// i.e. the bigger the scale size,
// the smaller the padding of the inner items.
$base-scale-size: (
'comfortable': 16px,
'cosy': 19px,
'compact': 22px
);

$bootstrap-inline-padding: (
'comfortable': rem(16px),
'cosy': rem(12px),
'comfortable': rem(14px),
'cosy': rem(10px),
'compact': rem(8px)
);

Expand All @@ -50,12 +35,6 @@
$input-top-padding: rem(20px);
$input-bottom-padding: rem(6px);

$bundle-padding-top: (
'comfortable': rem(18px, map.get($base-scale-size, 'comfortable')),
'cosy': rem(18px, map.get($base-scale-size, 'cosy')),
'compact': rem(18px, map.get($base-scale-size, 'compact')),
);

$hint-spacing-block: map.get((
'material': rem(4px),
'fluent': rem(5px),
Expand All @@ -64,7 +43,7 @@
), $variant);

$hint-spacing-inline: map.get((
'material': sizable(rem(14px), rem(16px), rem(18px)),
'material': sizable(rem(12px), rem(14px), rem(16px)),
'fluent': 0,
'bootstrap': 0,
'indigo': 0,
Expand All @@ -77,6 +56,23 @@
'indigo': rem(15px),
), $variant);

$material-box-top-padding: sizable(rem(16px), rem(20px), rem(24px));
$material-border-top-padding: sizable(rem(8px), rem(12px), rem(16px));

$textarea-top-padding: map.get((
'material': rem(0px),
'fluent': sizable(rem(6px), rem(10px), rem(14px)),
'bootstrap': sizable(rem(4px), rem(8px), rem(12px)),
'indigo': sizable(rem(4px), rem(6px), rem(8px)),
), $variant);

$textarea-font: map.get((
'material': 'var(--ig-subtitle-1-line-height)',
'fluent': 'var(--ig-body-2-line-height)',
'bootstrap': 'var(--ig-body-1-line-height)',
'indigo': 'var(--ig-body-2-line-height)',
), $variant);

// Base Start
%form-group-prefix--upload {
padding: 0;
Expand Down Expand Up @@ -115,7 +111,7 @@
} @else if $indigo-theme {
padding-inline: pad-inline(rem(2px), rem(4px), rem(6px));
} @else {
padding-inline: pad-inline(rem(8px), rem(12px), rem(16px));
padding-inline: pad-inline(rem(8px), rem(10px), rem(14px));
}
}
}
Expand Down Expand Up @@ -149,7 +145,7 @@
@include sizable();
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--input-size: var(--component-size);
--input-icon: #{sizable(rem(14px), rem(16px), rem(18px))};
--input-icon: #{sizable(rem(14px), rem(16px), rem(16px))};

position: relative;
display: block;
Expand Down Expand Up @@ -869,7 +865,7 @@

@if $variant == 'material' {
overflow: hidden;
min-width: pad(rem(10px), rem(12px), rem(14px));
min-width: pad(rem(8px), rem(10px), rem(12px));
}
}

Expand Down Expand Up @@ -1204,6 +1200,18 @@
}

@if $variant == 'material' {
%textarea-group:not(%textarea-group--outlined) {
--textarea-box-padding: #{pad-block(rem(8px), rem(12px), rem(16px))};

&:has(%igx-input-group__notch:not(:empty)) {
--textarea-box-padding: #{pad-block(rem(16px), rem(20px), rem(24px))};
}

%form-group-textarea {
margin-block-end: rem(2px);
}
}

%textarea-group:not(%suffixed) {
%form-group-bundle-main {
grid-area: 1 / 2 / span 1 / span 3;
Expand All @@ -1227,7 +1235,7 @@
%form-group-textarea-label:not(%textarea-group-label--focused) {
@include type-style('subtitle-1');

top: calc($input-top-padding - #{rem(3px)});
top: calc(#{$material-box-top-padding} - #{rem(3px)});
transform: translateY(0);
margin-bottom: auto;
}
Expand All @@ -1244,13 +1252,6 @@
}

%form-group-textarea-group-bundle {
// 3 lines * 22px + 8px bottom padding + 8px top padding
--textarea-size: #{sizable(
rem(82px, map.get($base-scale-size, 'compact')),
rem(82px, map.get($base-scale-size, 'cosy')),
rem(82px, map.get($base-scale-size, 'comfortable'))
)};
min-height: var(--textarea-size) !important;
height: auto !important;

%form-group-label {
Expand All @@ -1260,25 +1261,25 @@

@if $material-theme {
%form-group-textarea-label {
top: calc($input-top-padding - #{rem(1px)});
top: calc(#{$material-box-top-padding} - #{rem(1px)});
margin-block-end: auto;
}

%textarea-group--outlined {
%form-group-textarea-label {
top: calc($input-top-padding - #{rem(3px)});
top: calc(#{$material-border-top-padding} - #{rem(3px)});
}
}

%textarea-group--box {
%form-group-textarea-label {
top: calc($input-top-padding - #{rem(2px)});
top: calc(#{$material-box-top-padding} - #{rem(2px)});
}
}

%textarea-group-label--focused {
transform: translateY(0);
top: calc(#{$input-top-padding} / 4);
top: calc(#{$material-box-top-padding} / 4);
}

%textarea-group-label--filled--border,
Expand Down Expand Up @@ -1336,7 +1337,7 @@
overflow: hidden;
text-overflow: ellipsis;

&:not([type='date']) {
&:not(%form-group-textarea, [type='date']) {
line-height: 0 !important; /* Reset typography */
}

Expand Down Expand Up @@ -1450,29 +1451,13 @@
}

%form-group-textarea {
--textarea-size: #{sizable(
rem(82px, map.get($base-scale-size, 'compact')),
rem(82px, map.get($base-scale-size, 'cosy')),
rem(82px, map.get($base-scale-size, 'comfortable'))
)};

min-height: var(--textarea-size);
height: auto;
resize: vertical;
overflow: hidden;
z-index: 1;

@if $material-theme {
padding: 0;
inset-block-start: rem(-3px);
}

// resets typography styles
line-height: normal !important;

z-index: 1;

&:not([type='*']) {
line-height: normal !important; /* resets typography styles */
}
}

Expand All @@ -1485,7 +1470,17 @@
}

@if $material-theme {
padding-block-start: $input-top-padding;
padding-block-start: var(--textarea-box-padding);
}
}

%textarea-group--outlined {
%form-group-textarea-group-bundle-main {
padding-block-start: #{$material-border-top-padding};
}

%form-group-textarea {
inset-block-start: rem(-2px);
}
}

Expand Down Expand Up @@ -1643,7 +1638,6 @@
display: grid;
grid-auto-rows: minmax($hint-min-size, auto);
padding-inline: pad-inline($hint-spacing-inline);

justify-content: space-between;

> * {
Expand All @@ -1670,7 +1664,8 @@
}

%form-group-helper-item {
display: flex;
@include line-clamp(2, true, true);

align-items: center;
position: relative;
}
Expand Down Expand Up @@ -1710,7 +1705,9 @@
[igxPrefix],
igx-suffix,
[igxSuffix] {
padding-inline: pad-inline(rem(6px), rem(8px), rem(10px));
&:not(:empty) {
padding-inline: pad-inline(rem(6px), rem(8px), rem(10px));
}
}
}

Expand Down Expand Up @@ -2014,13 +2011,14 @@
}

%indigo-textarea {
padding-block: rem(6px);
padding-block: $textarea-top-padding 0;
padding-inline: pad-inline(rem(2px), rem(4px), rem(6px));
inset-block-end: rem(2px);
}

%fluent-textarea {
padding: rem(8px);
padding-inline: pad-inline(rem(8px));
padding-block: $textarea-top-padding 0;
}

%fluent-input-disabled {
Expand Down Expand Up @@ -2113,7 +2111,7 @@
%form-group-prefix-fluent-search,
%form-group-suffix-fluent-search {
&:not(:empty) {
padding-inline: pad-inline(rem(8px), rem(12px), rem(16px));
padding-inline: pad-inline(rem(8px), rem(10px), rem(14px));
}
}

Expand Down Expand Up @@ -2299,6 +2297,10 @@
map.get($bootstrap-inline-padding, 'cosy'),
map.get($bootstrap-inline-padding, 'comfortable')
);

&:is(textarea) {
padding-block: $textarea-top-padding 0;
}
}

// The :not selector is needed otherwise bootstrap will override the %autofill-background-fix
Expand Down
Loading
Loading