diff --git a/projects/arlas-components/src/lib/components/histogram/histogram.component.ts b/projects/arlas-components/src/lib/components/histogram/histogram.component.ts index e8c807da..80d88a30 100644 --- a/projects/arlas-components/src/lib/components/histogram/histogram.component.ts +++ b/projects/arlas-components/src/lib/components/histogram/histogram.component.ts @@ -18,27 +18,22 @@ */ import { - Component, OnInit, Input, Output, ViewEncapsulation, - ElementRef, OnChanges, SimpleChanges, AfterViewChecked, ViewChild, - OnDestroy + AfterViewChecked, Component, ElementRef, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core'; - +import { TranslateService } from '@ngx-translate/core'; import { AbstractChart, AbstractHistogram, AbstractSwimlane, ChartArea, ChartBars, ChartCurve, ChartOneDimension, ChartType, DataType, HistogramParams, HistogramUtils, Position, SelectedInputValues, SelectedOutputValues, SelectionType, SwimlaneBars, SwimlaneCircles, SwimlaneMode } from 'arlas-d3'; - -import { Subject, fromEvent } from 'rxjs'; -import { debounceTime, takeUntil } from 'rxjs/operators'; -import { NUMBER_FORMAT_CHAR } from '../componentsUtils'; - -import { TranslateService } from '@ngx-translate/core'; import { HistogramData, HistogramTooltip, SwimlaneData, SwimlaneOptions, SwimlaneRepresentation } from 'arlas-d3/histograms/utils/HistogramUtils'; +import { Subject, fromEvent } from 'rxjs'; +import { debounceTime, takeUntil } from 'rxjs/operators'; import { ArlasColorService } from '../../services/color.generator.service'; +import { NUMBER_FORMAT_CHAR } from '../componentsUtils'; import * as histogramJsonSchema from './histogram.schema.json'; import * as swimlaneJsonSchema from './swimlane.schema.json'; diff --git a/projects/arlas-components/src/lib/components/mapgl/mapgl.component.scss b/projects/arlas-components/src/lib/components/mapgl/mapgl.component.scss index 4ce86a9d..36912a73 100644 --- a/projects/arlas-components/src/lib/components/mapgl/mapgl.component.scss +++ b/projects/arlas-components/src/lib/components/mapgl/mapgl.component.scss @@ -79,12 +79,15 @@ --mdc-switch-track-width: 24px; --mdc-switch-track-height: 5px; - --mat-switch-unselected-handle-size: 12px !important; - --mat-switch-selected-handle-size: 12px !important; - --mat-switch-pressed-handle-size: 12px !important; --mdc-switch-handle-width: 12px; --mdc-switch-state-layer-size: 0; + .mdc-switch__handle { + --mat-switch-unselected-handle-size: 12px; + --mat-switch-selected-handle-size: 12px; + --mat-switch-pressed-handle-size: 12px; + } + &-text { color: #333; padding: 3px; diff --git a/projects/arlas-components/src/lib/components/results/result-list/result-list.component.scss b/projects/arlas-components/src/lib/components/results/result-list/result-list.component.scss index fdb003a3..9fda4271 100644 --- a/projects/arlas-components/src/lib/components/results/result-list/result-list.component.scss +++ b/projects/arlas-components/src/lib/components/results/result-list/result-list.component.scss @@ -176,13 +176,16 @@ tr { text-overflow: ellipsis; --mdc-switch-track-height: 10px; - --mat-switch-unselected-handle-size: 15px !important; - --mat-switch-selected-handle-size: 15px !important; - --mat-switch-pressed-handle-size: 15px !important; --mdc-switch-handle-width: 15px; --mdc-switch-track-width: 30px; --mdc-switch-state-layer-size: 0; + .mdc-switch__handle { + --mat-switch-unselected-handle-size: 15px; + --mat-switch-selected-handle-size: 15px; + --mat-switch-pressed-handle-size: 15px; + } + .mdc-form-field--align-end>label { padding-right: 10px; } diff --git a/projects/arlas-components/src/lib/components/results/result-list/result-list.component.ts b/projects/arlas-components/src/lib/components/results/result-list/result-list.component.ts index e85a0af1..4ce16d55 100644 --- a/projects/arlas-components/src/lib/components/results/result-list/result-list.component.ts +++ b/projects/arlas-components/src/lib/components/results/result-list/result-list.component.ts @@ -25,7 +25,7 @@ import { OnChanges, OnInit, Output } from '@angular/core'; import { MatButtonToggleChange } from '@angular/material/button-toggle'; import { MatSelectChange } from '@angular/material/select'; import { TranslateService } from '@ngx-translate/core'; -import { ngxLoadingAnimationTypes } from 'ngx-loading'; +import { ngxLoadingAnimationTypes } from 'ngx-loading-reloaded'; import { fromEvent, Observable, Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; import { ArlasColorService } from '../../../services/color.generator.service'; diff --git a/projects/arlas-components/src/lib/components/results/results.module.ts b/projects/arlas-components/src/lib/components/results/results.module.ts index 7c007f9a..0375daaa 100644 --- a/projects/arlas-components/src/lib/components/results/results.module.ts +++ b/projects/arlas-components/src/lib/components/results/results.module.ts @@ -33,7 +33,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { LazyLoadImageModule } from 'ng-lazyload-image'; -import { NgxLoadingModule } from 'ngx-loading'; +import { NgxLoadingModule } from 'ngx-loading-reloaded'; import { ColorGeneratorModule } from '../../services/color.generator.module'; import { ResultDetailedGridComponent } from './result-detailed-grid/result-detailed-grid.component'; import { ResultDetailedItemComponent } from './result-detailed-item/result-detailed-item.component';