Skip to content

Commit 5fefc86

Browse files
authored
Merge branch 'master' into dmdimitrov/issue7742-master
2 parents b5c85d1 + af5a276 commit 5fefc86

File tree

114 files changed

+1019
-647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1019
-647
lines changed

projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-theme.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@
5252
));
5353
}
5454

55-
////
56-
/// @group themes
57-
/// @access public
58-
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
59-
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
60-
////
61-
6255
/// Column hiding Theme
6356
/// The function is deprecated and will be removed in future versions. Use igx-column-actions-theme instead.
6457
/// @param {Map} $palette [$default-palette] - The palette used as basis for styling the component.

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717
@extend %igx-drop-down__list !optional;
1818
}
1919

20-
@include e(list, $m: empty) {
21-
@extend %igx-drop-down__list !optional;
22-
@extend %igx-drop-down__list--empty !optional;
23-
}
24-
2520
@include e(list-scroll) {
2621
@extend %igx-drop-down__list-scroll !optional;
2722
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,6 @@
236236
border: --var($theme, 'border-width') solid --var($theme, 'border-color');
237237
}
238238

239-
%igx-drop-down__list--empty {
240-
box-shadow: none;
241-
}
242-
243239
%igx-drop-down__list-scroll {
244240
overflow-y: auto;
245241
overflow-x: hidden;

projects/igniteui-angular/src/lib/core/styles/themes/schemas/elevation/_badge.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
55
////
6+
7+
/// @type Map
8+
/// @prop {Number} elevation [1] - The elevation level, between 0-24, to be used for the badge shadow.
69
$_default-elevation-badge: (
710
elevation: 1
811
);
912

1013
/// @type Map
14+
/// @prop {Number} elevation [0] - The elevation level, between 0-24, to be used for the badge shadow.
1115
$_bootstrap-elevation-badge: (
1216
elevation: 0
1317
);

projects/igniteui-angular/src/lib/core/styles/themes/schemas/elevation/_bottom-nav.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
55
////
66

77
/// @type Map
8+
/// @prop {Number} elevation [8] - The elevation level, between 0-24, to be used for the bottom nav.
89
$_default-elevation-bottom-nav: (
910
elevation: 8
1011
);
1112

1213
/// @type Map
14+
/// @prop {Number} elevation [1] - The elevation level, between 0-24, to be used for the bottom nav.
1315
$_fluent-elevation-bottom-nav: (
1416
elevation: 1
1517
);
1618

1719
/// @type Map
20+
/// @prop {Number} elevation [4] - The elevation level, between 0-24, to be used for the bottom nav.
1821
$_indigo-elevation-bottom-nav: (
1922
elevation: 4
2023
);

projects/igniteui-angular/src/lib/core/styles/themes/schemas/elevation/_button-group.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,38 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
55
////
66

77
/// @type Map
8+
/// @prop {Number} elevation [0] - The elevation level, between 0-24, to be used for the button group shadow.
89
$_flat-button-group: (
910
elevation: 0
1011
);
1112

1213
/// @type Map
14+
/// @prop {Number} elevation [2] - The elevation level, between 0-24, to be used for the button group shadow.
1315
$_default-elevation-button-group: (
1416
elevation: 2
1517
);
1618

1719
/// @type Map
20+
/// @requires {function} extend
21+
/// @requires {Map} $_flat-button-group
1822
$_fluent-elevation-button-group: extend(
1923
$_flat-button-group
2024
);
2125

2226
/// @type Map
27+
/// @requires {function} extend
28+
/// @requires {Map} $_flat-button-group
2329
$_bootstrap-elevation-button-group: extend(
2430
$_flat-button-group
2531
);
2632

2733
/// @type Map
34+
/// @requires {function} extend
35+
/// @requires {Map} $_flat-button-group
2836
$_indigo-elevation-button-group: extend(
2937
$_flat-button-group
3038
);

projects/igniteui-angular/src/lib/core/styles/themes/schemas/elevation/_button.scss

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
55
////
66

77
/// @type Map
8+
/// @prop {Number} raised-resting-elevation [0] - The elevation level, between 0-24, to be used for the resting state.
9+
/// @prop {Number} raised-hover-elevation [0] - The elevation level, between 0-24, to be used for the hover state.
10+
/// @prop {Number} raised-focus-elevation [0] - The elevation level, between 0-24, to be used for the focus state.
11+
/// @prop {Number} fab-resting-elevation [0] - The elevation level, between 0-24, to be used for the resting state.
12+
/// @prop {Number} fab-hover-elevation [0] - The elevation level, between 0-24, to be used for the hover state.
13+
/// @prop {Number} fab-focus-elevation [0] - The elevation level, between 0-24, to be used for the focus state.
814
$_flat-button: (
915
raised-resting-elevation: 0,
1016
raised-hover-elevation: 0,
@@ -16,6 +22,12 @@ $_flat-button: (
1622
);
1723

1824
/// @type Map
25+
/// @prop {Number} raised-resting-elevation [2] - The elevation level, between 0-24, to be used for the resting state.
26+
/// @prop {Number} raised-hover-elevation [4] - The elevation level, between 0-24, to be used for the hover state.
27+
/// @prop {Number} raised-focus-elevation [8] - The elevation level, between 0-24, to be used for the focus state.
28+
/// @prop {Number} fab-resting-elevation [6] - The elevation level, between 0-24, to be used for the resting state.
29+
/// @prop {Number} fab-hover-elevation [12] - The elevation level, between 0-24, to be used for the hover state.
30+
/// @prop {Number} fab-focus-elevation [12] - The elevation level, between 0-24, to be used for the focus state.
1931
$_default-elevation-button: (
2032
raised-resting-elevation: 2,
2133
raised-hover-elevation: 4,
@@ -27,10 +39,16 @@ $_default-elevation-button: (
2739
);
2840

2941
/// @type Map
42+
/// @requires {function} extend
43+
/// @requires {Map} $_flat-button
3044
$_fluent-elevation-button: extend($_flat-button);
3145

3246
/// @type Map
47+
/// @requires {function} extend
48+
/// @requires {Map} $_flat-button
3349
$_bootstrap-elevation-button: extend($_flat-button);
3450

3551
/// @type Map
52+
/// @requires {function} extend
53+
/// @requires {Map} $_flat-button
3654
$_indigo-elevation-button: extend($_flat-button);

projects/igniteui-angular/src/lib/core/styles/themes/schemas/elevation/_card.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
55
////
66

77
/// @type Map
8+
/// @prop {Number} resting-elevation [2] - The elevation level, between 0-24, to be used for the resting state.
9+
/// @prop {Number} hover-elevation [8] - The elevation level, between 0-24, to be used for the hover state.
810
$_default-elevation-card: (
911
resting-elevation: 2,
1012
hover-elevation: 8
1113
);
1214

1315
/// @type Map
16+
/// @prop {Number} resting-elevation [0] - The elevation level, between 0-24, to be used for the resting state.
17+
/// @prop {Number} hover-elevation [0] - The elevation level, between 0-24, to be used for the hover state.
1418
$_flat-card: (
1519
resting-elevation: 0,
1620
hover-elevation: 0
1721
);
1822

1923
/// @type Map
24+
/// @requires {function} extend
25+
/// @requires {Map} $_flat-card
2026
$_fluent-elevation-card: extend($_flat-card);
2127

2228
/// @type Map
29+
/// @requires {function} extend
30+
/// @requires {Map} $_flat-card
2331
$_bootstrap-elevation-card: extend($_flat-card);
2432

2533
/// @type Map
34+
/// @prop {Number} resting-elevation [4] - The elevation level, between 0-24, to be used for the resting state.
35+
/// @prop {Number} hover-elevation [6] - The elevation level, between 0-24, to be used for the hover state.
2636
$_indigo-elevation-card: (
2737
resting-elevation: 4,
2838
hover-elevation: 6
Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
55
////
66

77
/// @type Map
8+
/// @prop {Number} button-elevation [1] - The elevation level, between 0-24, to be used for the carousel buttons.
89
$_default-elevation-carousel: (
910
button-elevation: 1,
1011
);
1112

1213
/// @type Map
13-
$_fluent-elevation-carousel: (
14+
/// @prop {Number} button-elevation [0] - The elevation level, between 0-24, to be used for the carousel buttons.
15+
$_flat-carousel: (
1416
button-elevation: 0,
1517
);
1618

1719
/// @type Map
18-
$_bootstrap-elevation-carousel: (
19-
button-elevation: 0,
20-
);
20+
/// @requires {function} extend
21+
/// @requires {Map} $_flat-carousel
22+
$_fluent-elevation-carousel: extend($_flat-carousel);
2123

2224
/// @type Map
23-
$_indigo-elevation-carousel: (
24-
button-elevation: 0,
25-
);
25+
/// @requires {function} extend
26+
/// @requires {Map} $_flat-carousel
27+
$_bootstrap-elevation-carousel: extend($_flat-carousel);
28+
29+
/// @type Map
30+
/// @requires {function} extend
31+
/// @requires {Map} $_flat-carousel
32+
$_indigo-elevation-carousel: extend($_flat-carousel);
2633

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
////
22
/// @group schemas
3-
/// @access private
3+
/// @access public
44
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
55
////
66

77
/// @type Map
8+
/// @prop {Number} ghost-elevation [8] - The elevation level, between 0-24, to be used for the chip's ghost (dragging mode).
89
$_default-elevation-chip: (
910
ghost-elevation: 8
1011
);
1112

1213
/// @type Map
14+
/// @prop {Number} ghost-elevation [2] - The elevation level, between 0-24, to be used for the chip's ghost (dragging mode).
1315
$_fluent-elevation-chip: (
1416
ghost-elevation: 2
1517
);
1618

1719
/// @type Map
20+
/// @prop {Number} ghost-elevation [0] - The elevation level, between 0-24, to be used for the chip's ghost (dragging mode).
1821
$_bootstrap-elevation-chip: (
1922
ghost-elevation: 0
2023
);
2124

2225
/// @type Map
26+
/// @prop {Number} ghost-elevation [0] - The elevation level, between 0-24, to be used for the chip's ghost (dragging mode).
2327
$_indigo-elevation-chip: (
2428
ghost-elevation: 0
2529
);

0 commit comments

Comments
 (0)