Skip to content

Commit 2a4d5b0

Browse files
author
MPopov
committed
Merge branch 'simeonoff/indigo-theme' of https://github.com/IgniteUI/igniteui-angular into mpopov/fix-item-line-subtitle-contrast
2 parents 96c932b + 4294595 commit 2a4d5b0

File tree

120 files changed

+1191
-1043
lines changed

Some content is hidden

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

120 files changed

+1191
-1043
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/components/grid/_grid-theme.scss

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,18 +1557,11 @@
15571557
}
15581558

15591559
%igx-grid__th--active {
1560-
@extend %grid-cell--active;
1561-
1560+
%grid-cell-header,
15621561
%igx-grid__th--selected,
15631562
%igx-grid__th--selectable {
15641563
@extend %grid-cell--active
15651564
}
1566-
1567-
%igx-grid__filtering-cell,
1568-
%grid-cell-header {
1569-
border-right: none;
1570-
border-bottom: none;
1571-
}
15721565
}
15731566

15741567
%igx-grid-summary--active {

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158

159159
$drawer-icon-size: rem(24px);
160160
$drawer-item-margin: rem(8px);
161+
$text-side-padding: rem(8px);
161162
$drawer-item-min-h: auto;
162163
$drawer-item-max-h: rem(48px);
163164
$drawer-item-min-w: rem(32px);
@@ -297,15 +298,15 @@
297298
color: --var($theme, 'item-text-color');
298299
max-height: $drawer-item-max-h;
299300
min-width: $drawer-item-min-w;
300-
margin: $drawer-item-margin;
301301

302302
@if $variant != 'indigo-design' {
303+
// important is needed to override the typography margins
304+
margin: $drawer-item-margin !important;
303305
padding: rem(12px) rem(8px);
304306
} @else {
305-
padding: rem(4px) rem(4px);
306-
307307
// important is needed to override the typography margins
308308
margin: rem(15px) $drawer-item-margin !important;
309+
padding: rem(4px);
309310
}
310311

311312
cursor: pointer;
@@ -319,7 +320,17 @@
319320
justify-content: flex-start;
320321

321322
> igx-icon + span {
322-
margin-#{$left}: rem(32px);
323+
@if $variant == 'indigo-design' {
324+
margin-#{$left}: calc(32px - #{$text-side-padding});
325+
} @else {
326+
margin-#{$left}: rem(32px);
327+
}
328+
}
329+
330+
span {
331+
@if $variant == 'indigo-design' {
332+
padding-#{$left}: $text-side-padding;
333+
}
323334
}
324335

325336
igx-icon {

projects/igniteui-angular/src/lib/core/styles/components/watermark/_watermark-theme.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
/// Returns a map containing all style properties related to the theming the watermark directive.
88
/// @param {Map} $palette [$default-palette] - The palette used as basis for styling the component.
99
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the component.
10+
/// @param {Number} $border-radius [null] - The border radius used for the link.
11+
/// @param {Color} $border-color [null] - The border color used for the link.
12+
/// @param {Color} $link-background [null] - The background color used for the link.
13+
/// @param {Color} $color [null] - The color used for the link text.
1014
///
1115
/// @requires $default-palette
1216
/// @requires $light-schema
@@ -15,10 +19,10 @@
1519
/// @requires text-contrast
1620
/// @requires round-borders
1721
///
18-
/// @example scss Change the watermark background
19-
/// $my-watermark-theme: igx-watermark-theme($background: magenta);
22+
/// @example scss Change the watermark link background
23+
/// $my-watermark-theme: igx-watermark-theme($link-background: magenta);
2024
/// // Pass the theme to the igx-watermark component mixin
21-
/// @include igx-watermark($my-checkbox-theme);
25+
/// @include igx-watermark($my-watermark-theme);
2226
@function igx-watermark-theme(
2327
$palette: $default-palette,
2428
$schema: $light-schema,
@@ -85,6 +89,7 @@
8589
font-size: rem(14px);
8690
padding: rem(2px) rem(4px);
8791
line-height: normal;
92+
border-radius: --var($theme, 'border-radius');
8893
border: 1px solid --var($theme, 'border-color');
8994
color: --var($theme, 'color');
9095
z-index: 10002;
@@ -111,3 +116,4 @@
111116
}
112117
}
113118
}
119+

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);

0 commit comments

Comments
 (0)