Skip to content

Commit 8dd0f78

Browse files
authored
Merge branch 'master' into add-calendar-events-master
2 parents b191758 + ae6eccc commit 8dd0f78

File tree

9 files changed

+689
-5
lines changed

9 files changed

+689
-5
lines changed

ROADMAP.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,29 @@
22

33
# Current Milestone
44

5-
## Milestone 12 (Due by August, 2020)
5+
## Milestone 12 (Due by August 17th, 2020)
66

7-
1. Accept ISO 8601 Date-only string as input for igx-calendar and igx-datepicker [#6994](https://github.com/IgniteUI/igniteui-angular/issues/6994)
7+
1. igx-grid improve IGridEditEventArgs [#4965](https://github.com/IgniteUI/igniteui-angular/issues/4965)
88
2. igxCombo has to include caseSensitive property in filter search [#7282](https://github.com/IgniteUI/igniteui-angular/issues/7282)
99
3. igxCombo default positioning strategy [#7225](https://github.com/IgniteUI/igniteui-angular/issues/7225)
10-
To Be Updated
10+
4. igxSelect Add igxHint support [#5584](https://github.com/IgniteUI/igniteui-angular/issues/5584)
11+
5. igxGrid Hide the group area row [#5561](https://github.com/IgniteUI/igniteui-angular/issues/5561)
12+
6. igxDateRangePickerComponent calendar should display selected range if both start and end are filled and valid [#7593](https://github.com/IgniteUI/igniteui-angular/issues/7593)
13+
7. Add support for mixing px and % column widths [#5486](https://github.com/IgniteUI/igniteui-angular/issues/5486)
14+
8. Do not close modal overlay on ESC key press [#7697](https://github.com/IgniteUI/igniteui-angular/issues/7697)
15+
9. Themes: Add Dock Manager Support [#7541](https://github.com/IgniteUI/igniteui-angular/issues/7541)
16+
10. igx-grid - pre-select rows [#6653](https://github.com/IgniteUI/igniteui-angular/issues/6653)
17+
11. Average and Sum are shown on the Ship country level [#7334](https://github.com/IgniteUI/igniteui-angular/issues/7334)
18+
12. Dock Manager Better Default Themes [#7578](https://github.com/IgniteUI/igniteui-angular/issues/7578)
19+
13. Expose templates for all ESF UI parts [#7221](https://github.com/IgniteUI/igniteui-angular/issues/7221)
20+
14. Calendar events when user changes month/year [#7039](https://github.com/IgniteUI/igniteui-angular/issues/7039)
21+
15. igxGrid default column display templates per-type [#7224](https://github.com/IgniteUI/igniteui-angular/issues/7224)
22+
16. Provide "Unfreeze All" option under Freeze button on Data Grid & Tree Grid
23+
To Be Updated [#6549](https://github.com/IgniteUI/igniteui-angular/issues/6549)
24+
17. Exposing onActiveNodeChange output in the Grid [#7601](https://github.com/IgniteUI/igniteui-angular/issues/7601)
25+
18. Refactor commit method of IgxHierarchicalTransactionService to accept same parameters as base type [#5205](https://github.com/IgniteUI/igniteui-angular/issues/5205)
26+
19. Tooltip for grid cell text content [#6215](https://github.com/IgniteUI/igniteui-angular/issues/6215)
27+
20. Add tooltip to column summary [#6505](https://github.com/IgniteUI/igniteui-angular/issues/6505)
1128

1229

1330
## Going down the road

projects/igniteui-angular/src/lib/core/styles/components/charts/_category-chart-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@
282282

283283
$title-styles: igx-type-scale-category($type-scale, $title);
284284
$subtitle-styles: igx-type-scale-category($type-scale, $subtitle);
285-
$x-axis-label-styles: igx-type-scale-category($type-scale, $x-axis-label);
286-
$x-axis-title-styles: igx-type-scale-category($type-scale, $x-axis-title);
285+
$x-axis-label-styles: igx-type-scale-category($type-scale, $x-axis-label-text-style);
286+
$x-axis-title-styles: igx-type-scale-category($type-scale, $x-axis-title-text-style);
287287
$y-axis-label-styles: igx-type-scale-category($type-scale, $y-axis-label-text-style);
288288
$y-axis-title-styles: igx-type-scale-category($type-scale, $y-axis-title-text-style);
289289

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
////
2+
/// @group themes
3+
/// @access public
4+
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
5+
/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
6+
////
7+
8+
/// If only background color is specified, text/icon color will be assigned automatically to a contrasting color.
9+
/// @param {Map} $palette [$default-palette] - The palette used as basis for styling the component.
10+
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the component.
11+
///
12+
/// @param {Color} $accent-color [null] - Sets the pinned header background color, the joystick background and border colors, as well as the context menu background color.
13+
/// @param {Color} $active-color [null] - Sets the active text and border colors for tabs, panes, and menus.
14+
/// @param {Color} $border-color [null] - Sets the global border color in the dock manager. Also sets the pane content background and the context menu active background colors.
15+
/// @param {Color} $button-text [null] - Sets the button text color.
16+
/// @param {Color} $context-menu-background [null] - Sets the background color for context menus.
17+
/// @param {Color} $context-menu-background-active [null] - Sets the background color for active context menus.
18+
/// @param {Color} $context-menu-color [null] - Sets the text color for context menus.
19+
/// @param {Color} $context-menu-color-active [null] - Sets the text color for active context menus.
20+
/// @param {Color} $dock-background [null] - Sets the background color of the dock manager.
21+
/// @param {Color} $dock-text [null] - Sets the text color of the dock manager.
22+
/// @param {Color} $floating-pane-border-color [null] - Sets the border color for floating panes.
23+
/// @param {Color} $flyout-shadow-color [null] - Sets the flyout shadow color.
24+
/// @param {Color} $joystick-background [null] - Sets the background color of the joystick.
25+
/// @param {Color} $joystick-background-active [null] - Sets the background color of the joysticks.
26+
/// @param {Color} $joystick-border-color [null] - Sets the border color of the joystick.
27+
/// @param {Color} $joystick-icon-color [null] - Sets the color for the joystick icons.
28+
/// @param {Color} $joystick-icon-color-active [null] - Sets the color of the active joystick icons.
29+
/// @param {Color} $pane-content-background [null] - Sets the background color of the content panes.
30+
/// @param {Color} $pane-content-text [null] - Sets the text color of the content panes.
31+
/// @param {Color} $pane-header-background [null] - Sets the background color for pane headers.
32+
/// @param {Color} $pane-header-text [null] - Sets the text color for pane headers.
33+
/// @param {Color} $pinned-header-background [null] - Sets the background colors of pinned headers.
34+
/// @param {Color} $pinned-header-text [null] - Sets the text colors of pinned headers.
35+
/// @param {Color} $background-color [null] - Sets the base dock manager color as well as the pane headers and tabs background colors.
36+
/// @param {Color} $splitter-background [null] - Sets the background color for the splitters.
37+
/// @param {Color} $splitter-handle [null] - Sets the background color for the splitter handles.
38+
/// @param {Color} $tab-background [null] - Sets the background color for tabs.
39+
/// @param {Color} $tab-background-active [null] - Sets the background color for active tabs.
40+
/// @param {Color} $tab-border-color [null] - Sets the border color for tabs.
41+
/// @param {Color} $tab-border-color-active [null] - Sets the border color for active tabs.
42+
/// @param {Color} $tab-text [null] - Sets the text color for tabs.
43+
/// @param {Color} $tab-text-active [null] - Sets the text color for active tabs.
44+
/// @param {Color} $text-color [null] - Sets the text color for most elements in the dock manager. Used as the default joystick icon color.
45+
/// @requires $default-palette
46+
/// @requires $light-schema
47+
/// @requires apply-palette
48+
/// @requires text-contrast
49+
/// @requires extend
50+
///
51+
/// @example scss Change the background and icon colors in icon dock-managers
52+
/// $my-dock-manager-theme: igc-dock-manager-theme();
53+
/// // Pass the theme to the igc-dock-manager component mixin
54+
/// @include igx-css-vars($my-dock-manager-theme);
55+
@function igc-dock-manager-theme(
56+
$palette: $default-palette,
57+
$schema: $light-schema,
58+
$rest...
59+
) {
60+
$name: 'igc-dock-manager';
61+
$dock-manager-schema: ();
62+
63+
@if map-has-key($schema, $name) {
64+
$dock-manager-schema: map-get($schema, $name);
65+
} @else {
66+
$dock-manager-schema: $schema;
67+
}
68+
69+
$theme: apply-palette($dock-manager-schema, $palette);
70+
71+
@return extend($theme, (name: 'igc'), keywords($rest));
72+
}
73+
74+
75+
/// Adds typography styles for the dock manager component.
76+
/// @access private
77+
/// @group typography
78+
/// @requires {mixin} igx-type-style
79+
@mixin igx-dock-manager-typography() {
80+
$scope: if(is-root(), ':root', '&');
81+
82+
#{$scope} {
83+
@include css-vars-from-theme((font-family: inherit), 'igc');
84+
}
85+
}
86+

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
@import '../components/date-range-picker/date-range-picker-theme';
3737
@import '../components/dialog/dialog-theme';
3838
@import '../components/divider/divider-theme';
39+
@import '../components/dock-manager/dock-manager-theme';
3940
@import '../components/drop-down/drop-down-theme';
4041
@import '../components/expansion-panel/expansion-panel-theme';
4142
@import '../components/grid/grid-theme';
@@ -360,6 +361,10 @@
360361
@include igx-divider(igx-divider-theme($palette, $schema));
361362
}
362363

364+
@if not(index($exclude, 'igc-dock-manager')) {
365+
@include igx-css-vars(igc-dock-manager-theme($palette, $schema));
366+
}
367+
363368
@if not(index($exclude, 'igx-drop-down')) {
364369
@include igx-drop-down(igx-drop-down-theme(
365370
$palette,

0 commit comments

Comments
 (0)