Skip to content

Commit f9704ab

Browse files
author
MPopov
committed
Merge branch 'simeonoff/indigo-theme' of https://github.com/IgniteUI/igniteui-angular into mpopov/watermark-docs
� Conflicts: � projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_watermark.scss
2 parents 850f425 + 286b8d9 commit f9704ab

File tree

116 files changed

+989
-967
lines changed

Some content is hidden

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

116 files changed

+989
-967
lines changed

projects/igniteui-angular/src/lib/core/styles/base/utilities/_bem.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,62 +314,71 @@ $bem--sep-mod-val: if(variable-exists(bem--sep-mod-val), $bem--sep-mod-val, '-')
314314
}
315315

316316
/// @alias bem-selector
317+
/// @see bem-selector
317318
@mixin bem($block, $e: null, $elem: null, $m: null, $mod: null, $mods: null) {
318319
#{bem-selector($block, $e: $e, $elem: $elem, $m: $m, $mod: $mod, $mods: $mods)} {
319320
@content;
320321
}
321322
}
322323

323324
/// @alias bem-block
325+
/// @see bem-block
324326
@mixin block($block) {
325327
@include bem-block($block) {
326328
@content;
327329
}
328330
}
329331

330332
/// @alias bem-elem
333+
/// @see bem-elem
331334
@mixin elem($elem, $m: null, $mod: null, $mods: null) {
332335
@include bem-elem($elem, $m: $m, $mod: $mod, $mods: $mods) {
333336
@content;
334337
}
335338
}
336339

337340
/// @alias bem-mod
341+
/// @see bem-mod
338342
@mixin mod($mod) {
339343
@include bem-mod($mod) {
340344
@content;
341345
}
342346
}
343347

344348
/// @alias bem-mods
349+
/// @see bem-mods
345350
@mixin mods($mods...) {
346351
@include bem-mods($mods...) {
347352
@content;
348353
}
349354
}
350355

351356
/// @alias bem-block
357+
/// @see bem-block
352358
@mixin b($block) {
353359
@include bem-block($block) {
354360
@content;
355361
}
356362
}
357363

358364
/// @alias bem-elem
365+
/// @see bem-elem
359366
@mixin e($elem, $m: null, $mod: null, $mods: null) {
360367
@include bem-elem($elem, $m: $m, $mod: $mod, $mods: $mods) {
361368
@content;
362369
}
363370
}
364371

365372
/// @alias bem-mod
373+
/// @see bem-mod
366374
@mixin m($mod) {
367375
@include bem-mod($mod) {
368376
@content;
369377
}
370378
}
371379

372380
/// @alias bem-mods
381+
/// @see bem-mods
373382
@mixin mx($mods...) {
374383
@include bem-mods($mods...) {
375384
@content;

projects/igniteui-angular/src/lib/core/styles/base/utilities/_functions.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,12 @@
143143
@return $rgba;
144144
}
145145

146+
/// Converts a rgba color to a hexidecimal color.
147+
///
148+
/// An alias of hexrgba.
149+
/// @access public
146150
/// @alias hexrgba
151+
/// @see hexrgba
147152
@function to-opaque($rgba, $background: #fff) {
148153
@return hexrgba($rgba, $background);
149154
}
@@ -272,7 +277,7 @@
272277
}
273278

274279
/// Extends a Map object with the properties of another Map object.
275-
/// @access private
280+
/// @access public
276281
/// @param {Map...} $maps - The source map to get extended.
277282
/// @returns {Map} - Returns the merged maps.
278283
@function extend($maps...) {

projects/igniteui-angular/src/lib/core/styles/themes/_palettes.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ $default-dark-palette: igx-palette(
7272
/// @access public
7373
/// @group palettes
7474
/// @alias default-palette
75+
/// @see $default-palette
7576
$light-palette: $default-palette;
7677

7778
/// Same as $light-palette but with modified grays and surface colors.

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_action-strip.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
////
44
/// @group schemas
5-
/// @access private
5+
/// @access public
66
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
77
////
88

99
/// Generates a dark action-strip schema.
1010
/// @type {Map}
1111
/// @property {Map} actions-background [igx-color: ('grays', 200), hexrgba: #000, rgba: .8]- actions container background.
12+
/// @requires {function} extend
13+
/// @requires $_light-action-strip
1214
/// @see $default-palette
1315
$_dark-action-strip: extend(
1416
$_light-action-strip,

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_avatar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import '../light/avatar';
22
////
33
/// @group schemas
4-
/// @access private
4+
/// @access public
55
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
66
////
77

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22

33
////
44
/// @group schemas
5-
/// @access private
5+
/// @access public
66
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
77
////
88

99
/// Generates a dark badge schema.
1010
/// @type {Map}
11-
/// @requires extend
11+
/// @requires {function} extend
1212
/// @requires $_light-badge
1313
/// @see $default-palette
1414
$_dark-badge: extend($_light-badge);
1515

1616
/// Generates a dark fluent badge schema.
1717
/// @type {Map}
18-
/// @requires extend
18+
/// @requires {function} extend
1919
/// @requires $_fluent-badge
2020
$_dark-fluent-badge: extend($_fluent-badge);
2121

2222
/// Generates a dark bootstrap badge schema.
2323
/// @type {Map}
24-
/// @requires extend
24+
/// @requires {function} extend
2525
/// @requires $_bootstrap-badge
2626
$_dark-bootstrap-badge: extend($_bootstrap-badge);
2727

2828
/// Generates a dark indigo badge schema.
2929
/// @type {Map}
30-
/// @requires extend
30+
/// @requires {function} extend
3131
/// @requires $_indigo-badge
3232
$_dark-indigo-badge: extend($_indigo-badge);
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
@import '../light/banner';
22
////
33
/// @group schemas
4-
/// @access private
4+
/// @access public
55
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
66
////
77

88
/// Generates a dark banner schema.
99
/// @type {Map}
10-
/// @requires extend
10+
/// @requires {function} extend
1111
/// @requires $_light-banner
1212
/// @see $default-palette
1313
$_dark-banner: extend($_light-banner);
1414

1515
/// Generates a dark fluent banner schema.
1616
/// @type {Map}
17-
/// @requires extend
17+
/// @requires {function} extend
1818
/// @requires $_fluent-banner
1919
$_dark-fluent-banner: extend($_fluent-banner);
2020

2121
/// Generates a dark bootstrap banner schema.
2222
/// @type {Map}
23-
/// @requires extend
23+
/// @property {Map} banner-background [#333]- The background color used banner background.
24+
/// @requires {function} extend
2425
/// @requires $_bootstrap-banner
2526
$_dark-bootstrap-banner: extend(
2627
$_bootstrap-banner,
@@ -31,6 +32,6 @@ $_dark-bootstrap-banner: extend(
3132

3233
/// Generates a dark indigo banner schema.
3334
/// @type {Map}
34-
/// @requires extend
35+
/// @requires {function} extend
3536
/// @requires $_indigo-banner
3637
$_dark-indigo-banner: extend($_indigo-banner);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import '../light/bottom-nav';
22
////
33
/// @group schemas
4-
/// @access private
4+
/// @access public
55
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
66
////
77

@@ -37,8 +37,8 @@ $_dark-bootstrap-bottom-nav: extend($_bootstrap-bottom-nav, $_base-dark-bottom-n
3737
/// Generates a dark indigo bottom-nav schema based on a mix of $_indigo-bottom-nav and $_base-dark-bottom-nav
3838
/// @type {Map}
3939
/// @prop {Map} background [igx-color: 'surface'] - The background color used for the bottom-nav.
40-
/// @prop {Color} active-item-color [#fff] - The text-color used for the active color.
41-
/// @prop {Map} idle-item-color [igx-color: #fff, rgba: .6] - The text-color used for the idle color.
40+
/// @prop {Color} active-item-color [igx-contrast-color: 'surface'] - The text-color used for the active color.
41+
/// @prop {Map} idle-item-color [igx-contrast-color: 'surface', rgba: .6] - The text-color used for the idle color.
4242
/// @requires {function} extend
4343
/// @requires $_indigo-bottom-nav
4444
/// @requires $_base-dark-bottom-nav

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
@import '../light/button-group';
22
////
33
/// @group schemas
4-
/// @access private
4+
/// @access public
55
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
66
////
77

88

99
/// Generates the base dark button-group schema.
1010
/// @type {Map}
1111
/// @prop {Color} item-background [#222] - The background color for button group items.
12-
/// @prop {map} item-border-color [igx-color: ('grays', 400), hexrgba: #222] - The border color for button group items.
13-
/// @prop {map} item-selected-border-color [igx-color: ('grays', 500), hexrgba: #222] - The border color for button group selected items.
14-
/// @prop {map} item-disabled-border: [igx-color: ('grays', 400), hexrgba: #222] - The border color for button group disabled items.
12+
/// @prop {Map} item-border-color [igx-color: ('grays', 400), hexrgba: #222] - The border color for button group items.
13+
/// @prop {Map} item-selected-border-color [igx-color: ('grays', 500), hexrgba: #222] - The border color for button group selected items.
14+
/// @prop {Map} item-disabled-border: [igx-color: ('grays', 400), hexrgba: #222] - The border color for button group disabled items.
1515
$_base-dark-button-group: (
1616
item-background: #222,
1717

@@ -42,15 +42,15 @@ $_dark-button-group: extend($_light-button-group, $_base-dark-button-group);
4242
/// Generates a dark fluent button-group schema based on a mix of $_fluent-button-group and $_base-dark-button-group
4343
/// @type {Map}
4444
///
45-
/// @prop {map} item-border-color [igx-color: ('grays', 100), hexrgba: #000] - The border color for button group items.
46-
/// @prop {map} item-selected-border-color [igx-color: ('grays', 100), hexrgba: #000] - The border color for button group selected items.
47-
/// @prop {map} item-disabled-border: [igx-color: ('grays', 100), hexrgba: #000] - The border color for button group disabled items.
48-
/// @prop {map} item-text-color [igx-color: ('grays', 900)] - The text color for button group items.
49-
/// @prop {map} item-hover-text-color [igx-color: ('primary', 200)] - The text color for button group items on hover.
45+
/// @prop {Map} item-border-color [igx-color: ('grays', 100), hexrgba: #000] - The border color for button group items.
46+
/// @prop {Map} item-selected-border-color [igx-color: ('grays', 100), hexrgba: #000] - The border color for button group selected items.
47+
/// @prop {Map} item-disabled-border: [igx-color: ('grays', 100), hexrgba: #000] - The border color for button group disabled items.
48+
/// @prop {Map} item-text-color [igx-color: ('grays', 900)] - The text color for button group items.
49+
/// @prop {Map} item-hover-text-color [igx-color: ('primary', 200)] - The text color for button group items on hover.
5050
/// @prop {Color} item-hover-background [#222] - The background color for button group items on hover.
51-
/// @prop {map} item-selected-background [igx-color: ('grays', 100)] - The background color for button group selected items.
52-
/// @prop {map} item-selected-hover-background [igx-color: ('grays', 100)] - The background color for button group selected items on hover.
53-
/// @prop {map} item-selected-text-color [igx-color: ('primary', 200)] - The text color for button group selected items.
51+
/// @prop {Map} item-selected-background [igx-color: ('grays', 100)] - The background color for button group selected items.
52+
/// @prop {Map} item-selected-hover-background [igx-color: ('grays', 100)] - The background color for button group selected items on hover.
53+
/// @prop {Map} item-selected-text-color [igx-color: ('primary', 200)] - The text color for button group selected items.
5454
/// @prop {Color} disabled-background-color [#222] - The background color for button group disabled items.
5555
///
5656
/// @requires {function} extend

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import '../light/button';
22
////
33
/// @group schemas
4-
/// @access private
4+
/// @access public
55
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
66
////
77

@@ -12,7 +12,7 @@
1212
/// @prop {Map} flat-focus-background [igx-color: ('secondary', 400), rgba: .24] - The focus background color of a flat button.
1313
/// @prop {Map} icon-hover-background [igx-color: ('grays', 300)] - The hover background color of an icon button.
1414
/// @prop {Map} disabled-background [igx-color: ('grays', 200)] - The disabled background color of raised, fab, or icon buttons.
15-
/// @requires extend
15+
/// @requires {function} extend
1616
/// @requires $_light-button
1717
/// @see $default-palette
1818
$_dark-button: extend(
@@ -44,7 +44,7 @@ $_dark-button: extend(
4444
/// @prop {Map} flat-hover-icon-color [igx-color: ('primary', 200)] - The icon color of a flat button on hover.
4545
/// @prop {Map} flat-focus-icon-color [igx-color: ('primary', 200)] - The icon color of a flat button on focus.
4646
/// @prop {Map} flat-hover-text-color [igx-color: ('primary', 200)] - The text color of a flat button on hover.
47-
/// @requires extend
47+
/// @requires {function} extend
4848
/// @requires $_fluent-button
4949
$_dark-fluent-button: extend(
5050
$_fluent-button,
@@ -69,7 +69,10 @@ $_dark-fluent-button: extend(
6969

7070
/// Generates a dark bootstrap button schema.
7171
/// @type {Map}
72-
/// @requires extend
72+
/// @prop {Map} disabled-color [igx-color: ('primary', 900)] - The disabled text/icon color of a button.
73+
/// @prop {Map} disabled-background [igx-color: ('primary', 900), darken: 5%] - The disabled background color of raised, fab, or icon buttons.
74+
/// @prop {Map} outlined-disabled-outline-color [igx-color: ('primary', 900), darken: 5%] - The border color of an outlined button.
75+
/// @requires {function} extend
7376
/// @requires $_bootstrap-button
7477
$_dark-bootstrap-button: extend(
7578
$_bootstrap-button,
@@ -93,12 +96,12 @@ $_dark-bootstrap-button: extend(
9396
/// Generates a dark indigo button schema.
9497
/// @type {Map}
9598
///
96-
/// @prop {map} outlined-hover-background [#fff] - The hover background color of an outlined button.
99+
/// @prop {Map} outlined-hover-background [#fff] - The hover background color of an outlined button.
97100
/// @prop {Color} outlined-hover-text-color [(igx-color: 'surface')] - The hover text color of an outlined button.
98-
/// @prop {map} outlined-focus-background [#fff] - The focus background color of an outlined button.
101+
/// @prop {Map} outlined-focus-background [#fff] - The focus background color of an outlined button.
99102
/// @prop {Color} outlined-focus-text-color [(igx-color: 'surface')] - The focus text color of an outlined button.
100103
///
101-
/// @requires extend
104+
/// @requires {function} extend
102105
/// @requires $_indigo-button
103106
$_dark-indigo-button: extend(
104107
$_indigo-button,

0 commit comments

Comments
 (0)