Merge branch 'master' into igniteui-angular-5759

Author: simeonoff

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

@@ -34,10 +34,6 @@
         @include e(thumb-#{$t}) {
             @extend %igx-thumb-display !optional;
 
-            .label {
-                @extend %igx-thumb-label !optional;
-            }
-
             .dot {
                 @extend %igx-thumb-dot !optional;
             }
@@ -46,12 +42,24 @@
         @include e(thumb-#{$t}, $m: active) {
             @extend %igx-thumb--active !optional;
 
+            .dot {
+                @extend %igx-thumb-dot--active !optional;
+            }
+        }
+
+        @include e(label-#{$t}) {
+            @extend %igx-label-display !optional;
+
             .label {
-                @extend %igx-thumb-label--active !optional;
+                @extend %igx-thumb-label !optional;
             }
+        }
 
-            .dot {
-                @extend %igx-thumb-dot--active !optional;
+        @include e(label-#{$t}, $m: active) {
+            @extend %igx-thumb--active !optional;
+
+            .label {
+                @extend %igx-thumb-label--active !optional;
             }
         }
     }
@@ -91,10 +99,6 @@
                 @extend %igx-thumb-display !optional;
                 @extend %igx-thumb--disabled !optional;
 
-                .label {
-                    @extend %igx-thumb-label !optional;
-                }
-
                 .dot {
                     @extend %igx-thumb-dot--disabled !optional;
                 }

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

@@ -219,13 +219,26 @@
         }
     }
 
-    %igx-thumb-label {
+    %igx-label-display {
         position: absolute;
         display: flex;
+        justify-content: center;
+        align-items: center;
+        flex-direction: column;
+        height: $slider-thumb-height;
+        outline-style: none;
+        top: -#{rem($slider-thumb-radius)};
+        margin: 0 auto;
+    }
+
+    %igx-thumb-label {
+        position: relative;
+        display: flex;
         align-items: center;
         justify-content: center;
         flex: 0 0 auto;
-        top: -#{rem($slider-thumb-height - 6px)};
+        top: -#{rem($slider-thumb-height - 4px)};
+        left: -50%;
         pointer-events: none;
         min-width: rem($slider-label-width);
         height: rem($slider-label-height);
@@ -234,7 +247,7 @@
         margin: 0 auto;
         font-size: $slider-label-font-size;
         font-weight: $slider-label-font-weight;
-        line-height: 1;
+        line-height: rem(18px);
         color: --var($theme, 'label-text-color');
         background: --var($theme, 'label-background-color');
         opacity: 0;

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

@@ -22,7 +22,9 @@ import { IgxGridBaseComponent, IGridDataBindable } from './grid-base.component';
 import { IgxGridSelectionService, ISelectionNode, IgxGridCRUDService } from '../core/grid-selection';
 import { DeprecateProperty, DeprecateMethod } from '../core/deprecateDecorators';
 import { HammerGesturesManager } from '../core/touch';
-import { ColumnType, RowType, GridSelectionMode } from './types';
+import { ColumnType } from './common/column.interface';
+import { RowType } from './common/row.interface';
+import { GridSelectionMode } from './common/enums';
 
 /**
  * Providing reference to `IgxGridCellComponent`:

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

@@ -38,7 +38,7 @@ import {
     IgxCellHeaderTemplateDirective,
     IgxCellEditorTemplateDirective,
     IgxFilterCellTemplateDirective
-} from './types';
+} from './common/templates';
 
 /**
  * **Ignite UI for Angular Column** -

…/src/lib/grids/types/column.interface.ts …src/lib/grids/common/column.interface.tsprojects/igniteui-angular/src/lib/grids/types/column.interface.ts renamed to projects/igniteui-angular/src/lib/grids/common/column.interface.ts projects/igniteui-angular/src/lib/grids/types/column.interface.ts renamed to projects/igniteui-angular/src/lib/grids/common/column.interface.ts

@@ -90,12 +90,12 @@ import { IgxGridColumnResizerComponent } from './grid-column-resizer.component';
 import { IgxGridFilteringRowComponent } from './filtering/grid-filtering-row.component';
 import { IgxDragDirective } from '../directives/drag-drop/drag-drop.directive';
 import { CharSeparatedValueData } from '../services/csv/char-separated-value-data';
-import { FilterMode, GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode } from './types';
 import { IgxColumnResizingService } from './grid-column-resizing.service';
 import { IgxHeadSelectorDirective, IgxRowSelectorDirective } from './igx-row-selectors.module';
 import { DeprecateProperty } from '../core/deprecateDecorators';
 import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective,
      IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives';
+import { GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode, FilterMode } from './common/enums';
 
 const MINIMUM_COLUMN_WIDTH = 136;
 const FILTER_ROW_HEIGHT = 50;
@@ -2924,9 +2924,6 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
     public notifyChanges(repaint = false) {
         this._cdrRequests = true;
         this._cdrRequestRepaint = repaint;
-        if (!this._tick) {
-            this._tick = Promise.resolve().then(() => this._tick = null);
-        }
         this.cdr.markForCheck();
     }