Skip to content

Commit 6ed20d7

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into ha-mutliview-calendar-2
2 parents 2e006ff + 7c4c030 commit 6ed20d7

Some content is hidden

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

41 files changed

+215
-114
lines changed

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
@include e(thumb-#{$t}) {
3535
@extend %igx-thumb-display !optional;
3636

37-
.label {
38-
@extend %igx-thumb-label !optional;
39-
}
40-
4137
.dot {
4238
@extend %igx-thumb-dot !optional;
4339
}
@@ -46,12 +42,24 @@
4642
@include e(thumb-#{$t}, $m: active) {
4743
@extend %igx-thumb--active !optional;
4844

45+
.dot {
46+
@extend %igx-thumb-dot--active !optional;
47+
}
48+
}
49+
50+
@include e(label-#{$t}) {
51+
@extend %igx-label-display !optional;
52+
4953
.label {
50-
@extend %igx-thumb-label--active !optional;
54+
@extend %igx-thumb-label !optional;
5155
}
56+
}
5257

53-
.dot {
54-
@extend %igx-thumb-dot--active !optional;
58+
@include e(label-#{$t}, $m: active) {
59+
@extend %igx-thumb--active !optional;
60+
61+
.label {
62+
@extend %igx-thumb-label--active !optional;
5563
}
5664
}
5765
}
@@ -91,10 +99,6 @@
9199
@extend %igx-thumb-display !optional;
92100
@extend %igx-thumb--disabled !optional;
93101

94-
.label {
95-
@extend %igx-thumb-label !optional;
96-
}
97-
98102
.dot {
99103
@extend %igx-thumb-dot--disabled !optional;
100104
}

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,26 @@
219219
}
220220
}
221221

222-
%igx-thumb-label {
222+
%igx-label-display {
223223
position: absolute;
224224
display: flex;
225+
justify-content: center;
226+
align-items: center;
227+
flex-direction: column;
228+
height: $slider-thumb-height;
229+
outline-style: none;
230+
top: -#{rem($slider-thumb-radius)};
231+
margin: 0 auto;
232+
}
233+
234+
%igx-thumb-label {
235+
position: relative;
236+
display: flex;
225237
align-items: center;
226238
justify-content: center;
227239
flex: 0 0 auto;
228-
top: -#{rem($slider-thumb-height - 6px)};
240+
top: -#{rem($slider-thumb-height - 4px)};
241+
left: -50%;
229242
pointer-events: none;
230243
min-width: rem($slider-label-width);
231244
height: rem($slider-label-height);
@@ -234,7 +247,7 @@
234247
margin: 0 auto;
235248
font-size: $slider-label-font-size;
236249
font-weight: $slider-label-font-weight;
237-
line-height: 1;
250+
line-height: rem(18px);
238251
color: --var($theme, 'label-text-color');
239252
background: --var($theme, 'label-background-color');
240253
opacity: 0;

projects/igniteui-angular/src/lib/grids/cell.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ import { IgxGridBaseComponent, IGridDataBindable } from './grid-base.component';
2222
import { IgxGridSelectionService, ISelectionNode, IgxGridCRUDService } from '../core/grid-selection';
2323
import { DeprecateProperty, DeprecateMethod } from '../core/deprecateDecorators';
2424
import { HammerGesturesManager } from '../core/touch';
25-
import { ColumnType, RowType, GridSelectionMode } from './types';
25+
import { ColumnType } from './common/column.interface';
26+
import { RowType } from './common/row.interface';
27+
import { GridSelectionMode } from './common/enums';
2628

2729
/**
2830
* Providing reference to `IgxGridCellComponent`:

projects/igniteui-angular/src/lib/grids/column.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
IgxCellHeaderTemplateDirective,
3939
IgxCellEditorTemplateDirective,
4040
IgxFilterCellTemplateDirective
41-
} from './types';
41+
} from './common/templates';
4242

4343
/**
4444
* **Ignite UI for Angular Column** -

projects/igniteui-angular/src/lib/grids/grid-base.component.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ import { IgxGridColumnResizerComponent } from './grid-column-resizer.component';
9090
import { IgxGridFilteringRowComponent } from './filtering/grid-filtering-row.component';
9191
import { IgxDragDirective } from '../directives/drag-drop/drag-drop.directive';
9292
import { CharSeparatedValueData } from '../services/csv/char-separated-value-data';
93-
import { FilterMode, GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode } from './types';
9493
import { IgxColumnResizingService } from './grid-column-resizing.service';
9594
import { IgxHeadSelectorDirective, IgxRowSelectorDirective } from './igx-row-selectors.module';
9695
import { DeprecateProperty } from '../core/deprecateDecorators';
9796
import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective,
9897
IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives';
98+
import { GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode, FilterMode } from './common/enums';
9999

100100
const MINIMUM_COLUMN_WIDTH = 136;
101101
const FILTER_ROW_HEIGHT = 50;
@@ -2924,9 +2924,6 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
29242924
public notifyChanges(repaint = false) {
29252925
this._cdrRequests = true;
29262926
this._cdrRequestRepaint = repaint;
2927-
if (!this._tick) {
2928-
this._tick = Promise.resolve().then(() => this._tick = null);
2929-
}
29302927
this.cdr.markForCheck();
29312928
}
29322929

0 commit comments

Comments
 (0)