Skip to content
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.

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

feat(sizing): Use the sizable mixins and functions to size components. #12471

Merged
merged 46 commits into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
fbe3e46
feat(sizing): Use the sizable mixins and functions to size components.
desig9stein Dec 19, 2022
2cb37c7
Merge branch 'master' into mpopov/12347
simeonoff Jan 3, 2023
e87b408
Merge branch 'master' into mpopov/12347
SisIvanova Jan 4, 2023
644462d
feat(action-strip/paginator): sizable mixins and functions
SisIvanova Jan 6, 2023
30b63af
Merge branch 'master' into mpopov/12347
SisIvanova Jan 6, 2023
c7097e8
feat(list/tree): sizable mixins and functions
SisIvanova Jan 11, 2023
c3a8c1f
Merge branch 'master' into mpopov/12347
SisIvanova Jan 11, 2023
cb6e729
Merge branch 'master' into mpopov/12347
simeonoff Jan 11, 2023
21add45
Merge branch 'master' into mpopov/12347
desig9stein Jan 24, 2023
4fef1b7
Merge branch 'master' into mpopov/12347
ChronosSF Jan 25, 2023
e465609
Merge branch 'master' into mpopov/12347
simeonoff Jan 25, 2023
a84b7f1
refactor(grid) grid to use pad-block/pad-inline/pad and sizable funct…
desig9stein Feb 7, 2023
193ec4a
Merge branch 'master' into mpopov/12347
simeonoff Feb 10, 2023
8c480e2
Merge branch 'master' into mpopov/12347
desig9stein Feb 13, 2023
c564867
Merge branch 'master' into mpopov/12347
simeonoff Feb 16, 2023
1f0f138
Merge branch 'master' into mpopov/12347
desig9stein Feb 16, 2023
bb84eac
Merge branch 'master' into mpopov/12347
desig9stein Feb 20, 2023
9eb0e1b
Merge branch 'master' into mpopov/12347
simeonoff Feb 23, 2023
9fca7c9
Merge branch 'master' into mpopov/12347
desig9stein Mar 6, 2023
3967d18
feat(dropdown esf) fix some of the failing tests
desig9stein Mar 8, 2023
3970c74
Merge remote-tracking branch 'origin/master' into mpopov/12347
desig9stein Mar 8, 2023
28a325f
Merge remote-tracking branch 'origin/master' into mpopov/12347
desig9stein Mar 9, 2023
665567d
fix(dropdown) tests
desig9stein Mar 9, 2023
fd757f9
Merge branch 'master' into mpopov/12347
desig9stein Mar 9, 2023
16fbbe5
Merge branch 'master' into mpopov/12347
simeonoff Mar 15, 2023
6665ef1
lint(themes): base style declares scope twice
simeonoff Mar 15, 2023
2773eeb
Merge branch 'master' into mpopov/12347
simeonoff Mar 15, 2023
f04772a
Merge branch 'master' into mpopov/12347
desig9stein Mar 15, 2023
34709c6
Merge branch 'master' into mpopov/12347
simeonoff Apr 13, 2023
ba2a063
Merge branch 'master' into mpopov/12347
simeonoff May 2, 2023
0a08e47
fix(avatar) size
desig9stein May 2, 2023
4b01bdc
fix(badge) size and badge radius.
desig9stein May 2, 2023
31c488e
fix(banner) padding.
desig9stein May 2, 2023
394d6bd
fix(dropdown) groupt item text indent.
desig9stein May 2, 2023
f635639
fix(excel-filtering) Add sizable in external mode.
desig9stein May 3, 2023
46786b0
fix(badge) fix badge size in context of filtering row.
desig9stein May 3, 2023
8323c87
style(combo): make sure the the combo search padding looks the same a…
desig9stein May 4, 2023
d58e33b
Merge branch 'master' into mpopov/12347
SisIvanova May 4, 2023
c47c0ac
Merge branch 'master' into mpopov/12347
simeonoff May 5, 2023
45e06e5
Merge branch 'master' into mpopov/12347
simeonoff May 9, 2023
6da2efd
Merge branch 'master' into mpopov/12347
simeonoff May 9, 2023
9efe3bd
Merge branch 'master' into mpopov/12347
simeonoff May 9, 2023
5269603
refactor(chip): fix avatar size in chip context
simeonoff May 9, 2023
a4789f9
Merge branch 'master' into mpopov/12347
simeonoff May 9, 2023
86eb0a6
refactor(paginator): use placeholder selector for sizable
simeonoff May 9, 2023
08180a0
Merge branch 'mpopov/12347' of github.com:IgniteUI/igniteui-angular i…
simeonoff May 9, 2023
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 @@ -64,10 +64,10 @@
@mixin action-strip($theme) {
@include css-vars($theme);

$padding: (
comfortable: 0 rem(24px),
cosy: 0 rem(16px),
compact: 0 rem(12px)
$padding-inline: (
comfortable: rem(24px),
cosy: rem(16px),
compact: rem(12px)
);

$variant: map.get($theme, variant);
Expand All @@ -84,7 +84,8 @@
inset-inline-start: 0;
background: var-get($theme, 'background');
color: inherit;
padding: map.get($padding, 'comfortable');
padding-inline: pad-inline(map.get($padding-inline, 'compact'), map.get($padding-inline, 'cosy'), map.get($padding-inline, 'comfortable'));
padding-block: 0;
z-index: 9999;
}

Expand All @@ -101,14 +102,9 @@
}
}

%igx-action-strip--cosy {
@extend %action-icons-density;
padding: map.get($padding, 'cosy');
}

%igx-action-strip--cosy,
%igx-action-strip--compact {
@extend %action-icons-density;
padding: map.get($padding, 'compact');
}

%igx-action-strip__editing-actions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
@mixin component {
@include b(igx-avatar) {
@include sizable();
// Register the component in the component registry
$this: bem--selector-to-string(&);

@include register-component(
$name: string.slice($this, 2, -1),
$deps: (
Expand Down Expand Up @@ -41,15 +43,7 @@
}

@include m(initials) {
@extend %igx-avatar-initials--small !optional;
}

@include mx(medium, initials) {
@extend %igx-avatar-initials--medium !optional;
}

@include mx(large, initials) {
@extend %igx-avatar-initials--large !optional;
@extend %igx-avatar--initials !optional;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
/// @param {Color} $color [null] - The text color used of the avatar.
/// @param {Color} $background [null] - The background color used of the avatar.
/// @param {number} $border-radius [null] - The border-radius used of the avatar.
/// @param {number} $size [null] - The size of the avatar.
/// @requires $light-schema
///
/// @example scss Change the background and icon colors in icon avatars
Expand All @@ -27,7 +26,6 @@
$background: null,
$color: null,
$border-radius: null,
$size: null,
) {
$name: 'igx-avatar';
$avatar-schema: ();
Expand All @@ -53,20 +51,13 @@
background: $background,
color: $color,
border-radius: $border-radius,
size: $size
));
}

/// @param {Map} $theme - The theme used to style the component.
@mixin avatar($theme) {
@include css-vars($theme);

$variant: map.get($theme, variant);
$size: map.get($theme, 'size');
$small-size: rem(40px);
$medium-size: rem(64px);
$large-size: rem(88px);

$variant: map.get($theme, variant);
$bootstrap-theme: $variant == 'bootstrap';

Expand All @@ -87,6 +78,8 @@
}

%igx-avatar-display {
--size: #{sizable(#{rem(40px)}, #{rem(64px)}, #{rem(88px)})};

position: relative;
display: inline-flex;
justify-content: center;
Expand All @@ -98,6 +91,8 @@
border-radius: var-get($theme, 'border-radius');
outline-style: none;
flex-shrink: 0;
width: var(--size);
height: var(--size);

&::after {
box-shadow: none;
Expand Down Expand Up @@ -135,41 +130,22 @@

%igx-avatar--initials {
text-transform: uppercase;
font-size: calc(var(--size) / 2);
line-height: calc(var(--size) / 2);
}

%igx-avatar--small,
%igx-avatar-initials--small {
--size: #{$size or $small-size};
font-size: calc(#{var-get(('size': $size or $small-size), 'size')} / 2);
line-height: calc(#{var-get(('size': $size or $small-size), 'size')} / 2);
--component-size: var(--ig-size, var(--ig-size-small));
}

%igx-avatar--medium,
%igx-avatar-initials--medium {
--size: #{$size or $medium-size};
font-size: calc(#{var-get(('size': $size or $medium-size), 'size')} / 2);
line-height: calc(#{var-get(('size': $size or $medium-size), 'size')} / 2);
--component-size: var(--ig-size, var(--ig-size-medium));
}

%igx-avatar--large,
%igx-avatar-initials--large {
--size: #{$size or $large-size};
font-size: calc(#{var-get(('size': $size or $large-size), 'size')} / 2);
line-height: calc(#{var-get(('size': $size or $large-size), 'size')} / 2);
}

%igx-avatar--small {
--size: #{$size or $small-size};
width: var-get(('size': $size or $small-size), 'size');
height: var-get(('size': $size or $small-size), 'size');
}

%igx-avatar--medium {
--size: #{$size or $medium-size};
width: var-get(('size': $size or $medium-size), 'size');
height: var-get(('size': $size or $medium-size), 'size');
}

%igx-avatar--large {
--size: #{$size or $large-size};
width: var-get(('size': $size or $large-size), 'size');
height: var-get(('size': $size or $large-size), 'size');
--component-size: var(--ig-size, var(--ig-size-large));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
@extend %igx-badge-value !optional;
}

@include m(default) {
@extend %igx-badge--default !optional;
}

@include m(info) {
@extend %igx-badge--info !optional;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,29 +86,27 @@
@mixin badge($theme) {
@include css-vars($theme);

$badge-width: rem(22px);
$badge-height: $badge-width;

$badge-font-size: rem(11px);
$badge-font-weight: normal;

$badge-icon-font-size: rem(12px);

$badge-value-padding: rem(4px);
$border-type: solid;

%igx-badge-display {
--size: #{rem(22px)};
--font-size: calc(var(--size) / 2);
--icon-font-size: #{rem(12px)};

display: flex;
justify-content: center;
align-items: center;
min-width: $badge-width;
height: $badge-height;
font-size: $badge-font-size;
min-width: var(--size);
min-height: var(--size);
font-size: var(--font-size);
font-weight: $badge-font-weight;
color: var-get($theme, 'text-color');
line-height: 1;
background: var-get($theme, 'background-color');
border-radius: 50%;
border-radius: calc(var(--size) / 2);
box-shadow: var-get($theme, 'shadow');
border-width: var-get($theme, 'border-width');
border-color: var-get($theme, 'border-color');
Expand All @@ -119,9 +117,9 @@
display: inline-flex;
justify-content: center;
align-items: center;
width: var(--igx-icon-size, #{$badge-width - rem(2px)});
height: var(--igx-icon-size, #{$badge-width - rem(2px)});
font-size: var(--igx-icon-size, #{$badge-icon-font-size});
width: var(--igx-icon-size, #{var(--size) - rem(2px)});
height: var(--igx-icon-size, #{var(--size) - rem(2px)});
font-size: var(--igx-icon-size, #{var(--icon-font-size)});
font-weight: $badge-font-weight;
color: var-get($theme, 'icon-color');
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
}

@include b(igx-banner) {
@include sizable();
// Register the component in the component registry
$this: bem--selector-to-string(&);
@include register-component(
$name: string.slice($this, 2, -1),
Expand Down Expand Up @@ -46,12 +48,10 @@
}

@include m(cosy) {
@extend %igx-banner !optional;
@extend %igx-banner--cosy !optional
}
}

@include m(compact) {
@extend %igx-banner !optional;
@extend %igx-banner--compact !optional;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
$banner-illustration-color: null
) {
$name: 'igx-banner';
$selector: 'igx-banner, .igx-banner, .igx-banner--cosy, .igx-banner--compact';
$selector: 'igx-banner, .igx-banner';
$banner-schema: ();

@if map.has-key($schema, $name) {
Expand Down Expand Up @@ -61,11 +61,8 @@
@include css-vars($theme);
$variant: map.get($theme, 'variant');

$banner-padding: (
comfortable: rem(8px),
cosy: rem(8px),
compact: rem(8px)
);
$padding: rem(8px);
$padding-inline-start: calc(#{$padding} * 2);

%igx-banner-host {
igx-expansion-panel-body {
Expand All @@ -86,17 +83,28 @@
}

%igx-banner {
--component-size: var(--ig-size, var(--ig-size-large));

display: flex;
justify-content: flex-end;
flex-wrap: wrap;
grid-gap: rem(8px);
padding-inline-start: calc(#{map.get($banner-padding, 'comfortable') * 2});
padding-inline-end: map.get($banner-padding, 'comfortable');
padding-block-start: map.get($banner-padding, 'comfortable');
padding-block-end: map.get($banner-padding, 'comfortable');
gap: rem(8px);

padding-inline-start: pad-inline($padding-inline-start, $padding-inline-start, $padding-inline-start);
padding-inline-end: pad-inline($padding, $padding, $padding);
padding-block-start: pad-block($padding, $padding, $padding);
padding-block-end: pad-block($padding, $padding, $padding);
background: var-get($theme, 'banner-background');
}

%igx-banner--cosy {
--component-size: var(--ig-size, var(--ig-size-medium));
}

%igx-banner--compact {
--component-size: var(--ig-size, var(--ig-size-small));
}

%igx-banner__illustration {
justify-content: center;
width: rem(40px);
Expand Down Expand Up @@ -124,19 +132,6 @@
}
}

%igx-banner--cosy {
padding-inline-start: calc(#{map.get($banner-padding, 'cosy') * 2});
padding-inline-end: map.get($banner-padding, 'cosy');
padding-block-start: map.get($banner-padding, 'cosy');
padding-block-end: map.get($banner-padding, 'cosy');
}

%igx-banner--compact {
padding-inline-start: calc(#{map.get($banner-padding, 'compact') * 2});
padding-inline-end: map.get($banner-padding, 'compact');
padding-block-start: map.get($banner-padding, 'compact');
padding-block-end: map.get($banner-padding, 'compact');
}

%igx-banner__message {
min-width: rem(150px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
@mixin component {
@include b(igx-button) {
@include sizable();
$this: bem--selector-to-string(&);
@include register-component(
$name: string.slice($this, 2, -1),
Expand Down
Loading