Skip to content

Commit d718582

Browse files
DiyanDimitrovDiyanDimitrov
authored
Merge branch '10.2.x' into ibarakov/fix-8604-10.2.x
2 parents 95ee668 + 3989e10 commit d718582

26 files changed

+733
-116
lines changed

‎package-lock.json‎

Lines changed: 3 additions & 3 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
@@ -61,12 +61,12 @@
6161
"hammerjs": "^2.0.8",
6262
"igniteui-trial-watermark": "^1.0.3",
6363
"jszip": "^3.5.0",
64-
"lodash.merge": "^4.6.2",
65-
"uuid": "^8.3.0",
64+
"lodash.mergewith": "^4.6.2",
6665
"resize-observer-polyfill": "^1.5.1",
6766
"rxjs": "^6.6.3",
6867
"setimmediate": "^1.0.5",
6968
"tslib": "^2.0.0",
69+
"uuid": "^8.3.0",
7070
"web-animations-js": "^2.3.2",
7171
"zone.js": "~0.10.3"
7272
},

‎projects/igniteui-angular/ng-package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"jszip",
1212
"resize-observer-polyfill",
1313
"igniteui-trial-watermark",
14-
"lodash.merge",
14+
"lodash.mergewith",
1515
"uuid",
1616
"@igniteui/material-icons-extended"
1717
]

‎projects/igniteui-angular/ng-package.prod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"jszip",
1414
"resize-observer-polyfill",
1515
"igniteui-trial-watermark",
16-
"lodash.merge",
16+
"lodash.mergewith",
1717
"uuid",
1818
"@igniteui/material-icons-extended"
1919
]

‎projects/igniteui-angular/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"tslib": "^2.0.0",
7373
"resize-observer-polyfill": "^1.5.1",
7474
"igniteui-trial-watermark": "^1.0.3",
75-
"lodash.merge": "^4.6.2",
75+
"lodash.mergewith": "^4.6.2",
7676
"uuid": "^8.3.0",
7777
"@igniteui/material-icons-extended": "^2.4.0"
7878
},

‎projects/igniteui-angular/schematics/utils/dependency-handler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
2929
{ name: 'resize-observer-polyfill', target: PackageTarget.REGULAR },
3030
{ name: '@types/hammerjs', target: PackageTarget.DEV },
3131
{ name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
32-
{ name: 'lodash.merge', target: PackageTarget.NONE },
32+
{ name: 'lodash.mergewith', target: PackageTarget.NONE },
3333
{ name: 'uuid', target: PackageTarget.NONE },
3434
{ name: 'web-animations-js', target: PackageTarget.REGULAR },
3535
{ name: '@igniteui/material-icons-extended', target: PackageTarget.REGULAR },

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

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,38 @@
1111

1212
@extend %igx-button-display !optional;
1313

14+
@include m(cosy) {
15+
@extend %igx-button-display--cosy !optional;
16+
}
17+
18+
@include m(compact) {
19+
@extend %igx-button-display--compact !optional;
20+
}
21+
1422
// FLAT BUTTON
1523
@include m(flat) {
1624
@extend %igx-button-display !optional;
1725
@extend %igx-button--flat !optional;
1826
}
1927

28+
// RAISED BUTTON
29+
@include m(raised) {
30+
@extend %igx-button-display !optional;
31+
@extend %igx-button--raised !optional;
32+
}
33+
2034
// OUTLINED BUTTON
2135
@include m(outlined) {
2236
@extend %igx-button-display !optional;
2337
@extend %igx-button--outlined !optional;
2438
}
2539

26-
// RAISED BUTTON
27-
@include m(raised) {
28-
@extend %igx-button-display !optional;
29-
@extend %igx-button--raised !optional;
40+
@include mx(outlined-cosy, outlined) {
41+
@extend %igx-button--outlined-cosy !optional;
42+
}
43+
44+
@include mx(outlined-compact, outlined) {
45+
@extend %igx-button--outlined-compact !optional;
3046
}
3147

3248
// FAB BUTTON
@@ -53,12 +69,4 @@
5369
@include m(disabled) {
5470
@extend %igx-button--disabled !optional;
5571
}
56-
57-
@include m(cosy) {
58-
@extend %igx-button-display--cosy !optional;
59-
}
60-
61-
@include m(compact) {
62-
@extend %igx-button-display--compact !optional;
63-
}
6472
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,12 @@
464464
compact: rem(3px, 16px) rem(16px, 16px)
465465
);
466466

467+
$outlined-button-padding-material: (
468+
comfortable: rem(7px, 16px) rem(14px, 16px),
469+
cosy: rem(4px, 16px) rem(14px, 16px),
470+
compact: rem(1px, 16px) rem(14px, 16px)
471+
);
472+
467473
$button-padding-fluent: (
468474
comfortable: 0 rem(16px, 16px),
469475
cosy: 0 rem(16px, 16px),
@@ -476,13 +482,26 @@
476482
compact: rem(4px, 16px) rem(8px, 16px)
477483
);
478484

485+
$outlined-button-padding-indigo: (
486+
comfortable: rem(6px, 16px) rem(14px, 16px),
487+
cosy: rem(4px, 16px) rem(10px, 16px),
488+
compact: rem(2px, 16px) rem(6px, 16px)
489+
);
490+
479491
$button-padding: map-get((
480492
material: $button-padding-material,
481493
fluent: $button-padding-fluent,
482494
bootstrap: $button-padding-bootstrap,
483495
indigo-design: $button-padding-bootstrap,
484496
), $variant);
485497

498+
$outlined-button-padding: map-get((
499+
material: $outlined-button-padding-material,
500+
fluent: $button-padding-fluent,
501+
bootstrap: $button-padding-bootstrap,
502+
indigo-design: $outlined-button-padding-indigo
503+
), $variant);
504+
486505
$button--size-material: (
487506
comfortable: rem(36px),
488507
cosy: rem(30px),
@@ -653,6 +672,7 @@
653672
background: --var($theme, 'outlined-background');
654673
color: --var($theme, 'outlined-text-color');
655674
border-radius: --var($theme, 'outlined-border-radius');
675+
padding: map-get($outlined-button-padding, 'comfortable');
656676

657677
@if $variant != 'indigo-design' {
658678
border: $button-border;
@@ -690,6 +710,16 @@
690710
}
691711
}
692712

713+
%igx-button--outlined-cosy {
714+
padding: map-get($outlined-button-padding, 'cosy');
715+
min-height: map-get($button-size, 'cosy');
716+
}
717+
718+
%igx-button--outlined-compact {
719+
padding: map-get($outlined-button-padding, 'compact');
720+
min-height: map-get($button-size, 'compact');
721+
}
722+
693723
%igx-button--raised {
694724
color: --var($theme, 'raised-text-color');
695725
background: --var($theme, 'raised-background');

‎projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,7 @@
945945
height: 100%;
946946
color: --var($theme, 'content-text-color');
947947
flex-direction: column;
948+
padding: rem(24px);
948949
}
949950

950951
%igx-grid__loading {
@@ -2769,4 +2770,3 @@
27692770
}
27702771
}
27712772

2772-

‎projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_column-actions.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,9 @@ $_dark-fluent-column-actions: extend($_fluent-column-actions);
2323
/// @requires extend
2424
/// @requires $_bootstrap-column-actions
2525
$_dark-bootstrap-column-actions: extend($_bootstrap-column-actions);
26+
27+
/// Generates a dark indigo column actions schema.
28+
/// @type {Map}
29+
/// @requires extend
30+
/// @requires $_indigo-column-actions
31+
$_dark-indigo-column-actions: extend($_indigo-column-actions);

0 commit comments

Comments
 (0)