Skip to content

Commit b54228b

Browse files
DiyanDimitrovDiyanDimitrov
authored
Merge branch 'master' into rkolev/tabsBottomNavRouterSupport
2 parents e429197 + e479050 commit b54228b

34 files changed

+1493
-594
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
All notable changes for each version of this project will be documented in this file.
44
## 7.3.1
5-
- `Pager`
6-
- **Behavioral Change** - The pager is now hidden when there are no records in the grid.
5+
`igx-core()` now includes some styles for printing layout. In order to turn them off, you need to pass an argument and set it to `false`
6+
7+
```
8+
@include igx-core($print-layout: false);
9+
```
710

811
## 7.3.1
912
- `IgxGrid` Custom keyboard navigation
@@ -56,6 +59,16 @@ All notable changes for each version of this project will be documented in this
5659
</igx-drop-down>
5760
```
5861

62+
## 7.2.12
63+
### New feature
64+
- **igxSlider** - exposing new `labels` property accepting a collection of literal values that become equally spread over the slider, by placing each element as a thumb label.
65+
- **igxSlider** - deprecate **isContiunous** property.
66+
67+
## 7.2.9
68+
- `Pager`
69+
- **Behavioral Change** - The pager is now hidden when there are no records in the grid.
70+
71+
5972
## 7.2.6
6073
- `igxGrid`
6174
- **Feature** The `groupsRecords` property now returns the full grouping tree as in 7.1 and also includes the grouping information for all pages.

‎README.md‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can find source files under the [`src`](https://github.com/IgniteUI/igniteui
1717

1818
**IMPORTANT** The repository has been renamed from `igniteui-js-blocks` to `igniteui-angular`. Read more on our new [naming convention](https://www.infragistics.com/community/blogs/b/infragistics/posts/ignite-ui-github-repo-name-changes).
1919

20-
Current list of controls include:
20+
#### Current List of Components Include:
2121

2222
|Components|Status|||Directives|Status|||
2323
|:--|:--|:--|:--|:--|:--|:--|:--|
@@ -56,6 +56,33 @@ Current list of controls include:
5656
|toast|Available|[Readme](https://github.com/IgniteUI/igniteui-angular/blob/master/projects/igniteui-angular/src/lib/toast/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/toast.html)|||||
5757
|tree grid|Available|[Readme](https://github.com/IgniteUI/igniteui-angular/blob/master/projects/igniteui-angular/src/lib/grids/tree-grid/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/treegrid.html)|||||
5858

59+
#### Components available in [igniteui-angular-charts](https://www.npmjs.com/package/igniteui-angular-charts)
60+
|Components||
61+
|:---|:---|
62+
|Category Chart|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/categorychart.html)|
63+
|Data Chart|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/datachart.html)|
64+
|Financial Chart|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/financialchart.html)|
65+
|Doughnut Chart|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/doughnutchart.html)|
66+
|Pie Chart|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/piechart.html)|
67+
68+
#### Components available in [igniteui-angular-gauges](https://www.npmjs.com/package/igniteui-angular-gauges)
69+
|Components||
70+
|:---|:---|
71+
|Bullet Graph|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/bulletgraph.html)|
72+
|Linear Gauge|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/lineargauge.html)|
73+
|Radial Gauge|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/radialgauge.html)|
74+
75+
#### Components available in [igniteui-angular-excel](https://www.npmjs.com/package/igniteui-angular-excel)
76+
|Components||
77+
|:---|:---|
78+
|Excel Library|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/excel_library.html)|
79+
80+
81+
#### Components available in [igniteui-angular-spreadsheet](https://www.npmjs.com/package/igniteui-angular-spreadsheet)
82+
|Components||
83+
|:---|:---|
84+
|Spreadsheet|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/spreadsheet_overview.html)|
85+
5986
## Setup
6087
From the root folder run:
6188

‎projects/igniteui-angular/src/lib/combo/combo.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
13071307
* @hidden @internal
13081308
*/
13091309
public ngOnDestroy() {
1310+
this.destroy$.next();
13101311
this.destroy$.complete();
13111312
this.comboAPI.clear();
13121313
this.selection.clear(this.id);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@
128128

129129
%igx-grid-summary--pinned-last {
130130
border-right: map-get($cell-pin, 'style') map-get($cell-pin, 'color');
131+
@media print {
132+
border-right: map-get($cell-pin, 'style') #999;
133+
}
131134
}
132135

133136
%igx-grid-summary__item {

‎projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -505,26 +505,24 @@
505505
position: absolute;
506506
width: 100%;
507507
transform: translateY(50%); /* 8px, base is 16px */
508-
line-height: rem(16px, map-get($base-scale-size, 'comfortable')) !important;
509-
height: rem(18px, map-get($base-scale-size, 'comfortable'));
508+
line-height: 1 !important;
509+
height: rem(18px);
510510
backface-visibility: hidden;
511511
will-change: transform;
512512
transform-origin: top left;
513-
transition: transform $transition-timing, color $transition-timing;
513+
transition: transform $transition-timing, color $transition-timing, margin $transition-timing;
514514

515515
[dir='rtl'] & {
516516
transform-origin: top right;
517517
}
518518
}
519519

520520
%form-group-label--cosy {
521-
line-height: rem(16px, map-get($base-scale-size, 'cosy')) !important;
522-
height: rem(18px, map-get($base-scale-size, 'cosy'));
521+
margin-top: rem(-2px);
523522
}
524523

525524
%form-group-label--compact {
526-
line-height: rem(16px, map-get($base-scale-size, 'compact')) !important;
527-
height: rem(18px, map-get($base-scale-size, 'compact'));
525+
margin-top: rem(-4px);
528526
}
529527

530528
%form-group-label--box {
@@ -534,6 +532,7 @@
534532
%form-group-label--float {
535533
overflow: visible;
536534
transform: translateY(-50%) scale(.75);
535+
margin-top: auto;
537536
}
538537

539538
%form-group-label--fixed {
@@ -574,6 +573,8 @@
574573
color: --var($theme, 'filled-text-color');
575574
outline-style: none;
576575
box-shadow: none;
576+
border-top: rem(3px) solid transparent;
577+
padding-bottom: rem(3px);
577578

578579
&::-webkit-input-placeholder {
579580
line-height: normal;
@@ -886,17 +887,6 @@
886887
$input-text-props: igx-type-scale-category($type-scale, $input-text);
887888

888889
@include igx-scope('.igx-typography') {
889-
%form-group-label {
890-
@include igx-type-style($type-scale, $input-text) {
891-
// This is embarrassing but there's no other
892-
// way to extract the font-size the user sets
893-
// in case they use custom typography :(
894-
// We need the padding so that the text doesn't get
895-
// cut off.
896-
padding-bottom: map-get($input-text-props, 'font-size');
897-
}
898-
}
899-
900890
%form-group-input {
901891
@include igx-type-style($type-scale, $input-text) {
902892
margin: 0;

‎projects/igniteui-angular/src/lib/core/styles/components/slider/_slider-theme.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
width: 100%;
135135
height: inherit;
136136
background: --var($theme, 'track-color');
137-
transform-origin: 0 0 0;
137+
transform-origin: left center;
138138
transform: scaleX(0);
139139
}
140140

‎projects/igniteui-angular/src/lib/core/styles/print/_grid-print.scss‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
$border-color: #ddd;
2+
$border-pin-color: #999;
3+
$print-background: #f9f9f9;
4+
$print-background: #eee;
5+
6+
@mixin igx-grid-print {
7+
%grid-display {
8+
%form-group-display,
9+
%cbx-display,
10+
%radio-display,
11+
%igx-grid__grouparea,
12+
%tooltip-display,
13+
%aside,
14+
%overlay-display,
15+
%igx-ripple-display,
16+
%igx-slider-display,
17+
%igx-snackbar-display,
18+
%switch-display,
19+
%time-picker-display,
20+
%igx-toast-display,
21+
%igx-tabs,
22+
%igx-navbar-display,
23+
%igx-button--flat,
24+
%igx-button--raised,
25+
%igx-button--fab,
26+
%igx-button--icon,
27+
%igx-button--disabled,
28+
%grid-tbody-scrollbar,
29+
%vhelper-display,
30+
%igx-grid-paginator,
31+
%igx-grid-toolbar__actions,
32+
%grid__cbx-selection,
33+
%igx-drop-area__icon,
34+
%igx-drop-area__text,
35+
%igx-grid__header-indentation,
36+
%igx-grid__grouping-indicator,
37+
%igx-grid__row-indentation,
38+
%igx-grid__hierarchical-expander {
39+
display: none !important;
40+
}
41+
42+
%igx-grid__grouparea,
43+
%igx-grid-paginator,
44+
%igx-grid-toolbar__actions,
45+
%igx-drop-area__icon,
46+
%igx-drop-area__text,
47+
%igx-grid__header-indentation,
48+
%igx-grid__grouping-indicator,
49+
%igx-grid__row-indentation,
50+
%igx-grid__hierarchical-expander,
51+
%igx-expansion-panel__header-icon--end,
52+
%igx-expansion-panel__header-icon--start,
53+
%grid-summaries-patch {
54+
display: none !important;
55+
}
56+
57+
58+
%igx-grid__grouping-indicator {
59+
igx-icon {
60+
display: none !important;
61+
}
62+
}
63+
64+
%igx-grid__filtering-cell {
65+
height: 0 !important;
66+
border-top: none !important;
67+
border-right: none !important;
68+
}
69+
70+
%grid-tfoot,
71+
%igx-grid__grouparea,
72+
%igx-grid__filtering-cell,
73+
%igx-grid__group-row,
74+
%grid-cell-header,
75+
%igx-grid-toolbar,
76+
%grid-thead-title,
77+
%grid-row,
78+
%grid-thead {
79+
border-color: $border-color !important;
80+
}
81+
82+
%grid-display {
83+
igx-icon {
84+
color: #666 !important;
85+
}
86+
}
87+
88+
%grid-thead,
89+
%igx-grid-toolbar,
90+
%igx-grid__group-row,
91+
%grid-tfoot {
92+
background: $print-background !important;
93+
}
94+
95+
%grid-cell-header-title,
96+
%grid-cell-text {
97+
white-space: unset !important;
98+
text-overflow: initial !important;
99+
overflow: visible !important;
100+
}
101+
102+
%grid-cell-display {
103+
igx-icon {
104+
display: none;
105+
}
106+
}
107+
108+
%grid-summaries-patch {
109+
display: none;
110+
}
111+
112+
%grid-cell--pinned-last {
113+
border-right: 2px solid red !important;
114+
}
115+
}
116+
}

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
@import 'grid-print';
2+
3+
@mixin igx-print-layout {
4+
@media print {
5+
html,
6+
body,
7+
app-root {
8+
min-height: 100vh;
9+
min-width: 100vw;
10+
margin: 0;
11+
display: block;
12+
}
13+
14+
* {
15+
background: transparent !important;
16+
background-color: transparent !important;
17+
color: #000 !important;
18+
box-shadow: none !important;
19+
text-shadow: none !important;
20+
-webkit-print-color-adjust: exact;
21+
}
22+
23+
a[href^='http']::after {
24+
content: '[' attr(href) ']';
25+
color: blue;
26+
}
27+
28+
.igx-no-print,
29+
igx-nav-drawer {
30+
display: none !important;
31+
}
32+
33+
@include igx-grid-print();
34+
35+
%igx-bottom-nav-menu,
36+
%igx-group-display,
37+
%igx-ripple-display,
38+
%igx-slider-display,
39+
%igx-snackbar-display,
40+
%form-group-display,
41+
%cbx-display,
42+
%radio-display,
43+
%tooltip-display,
44+
%igx-toast-display,
45+
%igx-navbar-display,
46+
%vhelper-display,
47+
%igx-button--flat,
48+
%igx-button--raised,
49+
%igx-button--fab,
50+
%igx-button--icon,
51+
%igx-button--disabled,
52+
%igx-tabs__header,
53+
%switch-display,
54+
%grid-tbody-scrollbar,
55+
%grid__cbx-selection,
56+
%circular-display,
57+
%linear-display,
58+
.igx-carousel__indicators,
59+
.igx-carousel__arrow--prev,
60+
.igx-carousel__arrow--next {
61+
display: none !important;
62+
}
63+
}
64+
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
@import '../components/toast/toast-component';
5757
@import '../components/tooltip/tooltip-component';
5858
@import '../components/time-picker/time-picker-component';
59+
@import '../print/index';
5960

6061
/// Includes the base for each theme.
6162

@@ -68,6 +69,10 @@
6869
}
6970
}
7071

71-
@mixin igx-core() {
72+
@mixin igx-core($print-layout:true) {
7273
@include igx-typography();
74+
75+
@if $print-layout == true {
76+
@include igx-print-layout();
77+
}
7378
}

0 commit comments

Comments
 (0)