Skip to content

Commit 04bae2d

Browse files
authored
refactor(*): use default size from component schemas (#13593)
1 parent f78e881 commit 04bae2d

File tree

11 files changed

+19
-15
lines changed

11 files changed

+19
-15
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"express": "^4.18.2",
7171
"fflate": "^0.7.3",
7272
"hammerjs": "^2.0.8",
73-
"igniteui-theming": "^3.3.0",
73+
"igniteui-theming": "^3.3.3",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
7676
"rxjs": "^6.6.7",
@@ -138,4 +138,4 @@
138138
"typedoc-plugin-localization": "^3.0.3",
139139
"typescript": "5.2.2"
140140
}
141-
}
141+
}

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"igniteui-trial-watermark": "^3.0.2",
7777
"lodash-es": "^4.17.21",
7878
"uuid": "^9.0.0",
79-
"igniteui-theming": "^3.3.0",
79+
"igniteui-theming": "^3.3.3",
8080
"@igniteui/material-icons-extended": "^3.0.0"
8181
},
8282
"peerDependencies": {

projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
%igx-avatar-display {
8484
@include sizable();
85-
--component-size: var(--ig-size, var(--ig-size-small));
85+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
8686

8787
position: relative;
8888
display: inline-flex;

projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@
456456

457457
%igx-button-display {
458458
@include sizable();
459-
--component-size: var(--ig-size, var(--ig-size-large));
460459

461460
position: relative;
462461
display: inline-flex;
@@ -526,6 +525,7 @@
526525
}
527526

528527
%igx-button--flat {
528+
--component-size: var(--ig-size, #{var-get($flat-theme, 'default-size')});
529529
background: var-get($flat-theme, 'background');
530530
color: var-get($flat-theme, 'foreground');
531531
border-radius: var-get($flat-theme, 'border-radius');
@@ -566,6 +566,7 @@
566566
}
567567

568568
%igx-button--outlined {
569+
--component-size: var(--ig-size, #{var-get($outlined-theme, 'default-size')});
569570
background: var-get($outlined-theme, 'background');
570571
color: var-get($outlined-theme, 'foreground');
571572
border-color: var-get($outlined-theme, 'border-color');
@@ -668,6 +669,7 @@
668669
}
669670

670671
%igx-button--raised {
672+
--component-size: var(--ig-size, #{var-get($raised-theme, 'default-size')});
671673
color: var-get($raised-theme, 'foreground');
672674
background: var-get($raised-theme, 'background');
673675
box-shadow: $raised-shadow;
@@ -774,6 +776,7 @@
774776
}
775777

776778
%igx-button--fab {
779+
--component-size: var(--ig-size, #{var-get($fab-theme, 'default-size')});
777780
padding-block: pad-block(
778781
map.get($button-floating-padding-block, 'compact'),
779782
map.get($button-floating-padding-block, 'cosy'),
@@ -880,6 +883,7 @@
880883
}
881884

882885
%igx-button--icon {
886+
--component-size: var(--ig-size, #{var-get($icon-theme, 'default-size')});
883887
width: var-get($icon-theme, 'size');
884888
height: var-get($icon-theme, 'size');
885889
min-width: unset;

projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299

300300
%igx-chip {
301301
@include sizable();
302-
--component-size: var(--ig-size, var(--ig-size-large));
302+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
303303
--chip-size: var(--component-size);
304304

305305
position: relative;

projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
%igx-drop-down__list {
195195
@include sizable();
196196

197-
--component-size: var(--ig-size, var(--ig-size-large));
197+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
198198
--dropdown-size: var(--component-size);
199199
overflow: hidden;
200200
border-radius: var-get($theme, 'border-radius');

projects/igniteui-angular/src/lib/core/styles/components/icon/_icon-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
// this approach effectively enables us to eliminate any potential style conflicts without the need of !important
5656
%igx-icon-display {
5757
@include sizable();
58-
--component-size: var(--ig-size, var(--ig-size-large));
58+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
5959

6060
display: inline-flex;
6161
font-size: $size;

projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399

400400
%form-group-display {
401401
@include sizable();
402-
--component-size: var(--ig-size, var(--ig-size-large));
402+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
403403
--input-size: var(--component-size);
404404

405405
position: relative;

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
%igx-list {
282282
@include sizable();
283283

284-
--component-size: var(--ig-size, var(--ig-size-large));
284+
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
285285
--list-size: var(--component-size);
286286
position: relative;
287287
display: flex;

0 commit comments

Comments
 (0)