Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 8a613d4

Browse files
authored
fix(styling): flatpickr bg-color should be using SASS variable (#616)
1 parent 07bd99a commit 8a613d4

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

src/app/modules/angular-slickgrid/filters/dateRangeFilter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export class DateRangeFilter implements Filter {
166166
// private functions
167167
// ------------------
168168
private buildDatePickerInput(searchTerms?: SearchTerm | SearchTerm[]) {
169-
const columnId = this.columnDef && this.columnDef.id;
169+
const columnId = this.columnDef && this.columnDef.id || '';
170170
const inputFormat = mapFlatpickrDateFormatWithFieldType(this.columnFilter.type || this.columnDef.type || FieldType.dateIso);
171171
const outputFormat = mapFlatpickrDateFormatWithFieldType(this.columnDef.outputType || this.columnFilter.type || this.columnDef.type || FieldType.dateUtc);
172172
const userFilterOptions = (this.columnFilter && this.columnFilter.filterOptions || {}) as FlatpickrOption;

src/app/modules/angular-slickgrid/styles/slick-plugins.scss

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -755,30 +755,29 @@ input.search-filter {
755755

756756
.search-filter .flatpickr {
757757
input.form-control {
758-
cursor: pointer;
759758
border-left: none;
760759
}
760+
}
761+
.search-filter.flatpickr,
762+
.search-filter .flatpickr {
763+
flex: 1;
764+
cursor: pointer;
761765

762-
.flatpickr {
763-
flex: 1;
764-
cursor: pointer;
765-
766-
input.flatpickr.form-control,
767-
.flatpickr-input.form-control {
768-
background-color: $flatpickr-bgcolor;
769-
font-family: $filter-placeholder-font-family;
770-
font-size: $font-size-base;
771-
border-radius: $compound-filter-border-radius;
772-
width: 100%;
773-
&[readonly] {
774-
background-color: $flatpickr-bgcolor;
775-
}
776-
}
777-
.form-control[readonly],
778-
.flatpickr.form-control[readonly] {
766+
input.flatpickr.form-control,
767+
.flatpickr-input.form-control {
768+
background-color: $flatpickr-bgcolor;
769+
font-family: $filter-placeholder-font-family;
770+
font-size: $font-size-base;
771+
border-radius: $compound-filter-border-radius;
772+
width: 100%;
773+
&[readonly] {
779774
background-color: $flatpickr-bgcolor;
780775
}
781776
}
777+
.form-control[readonly],
778+
.flatpickr.form-control[readonly] {
779+
background-color: $flatpickr-bgcolor;
780+
}
782781
}
783782
input.flatpickr-input.form-control,
784783
input.flatpickr.form-control {

0 commit comments

Comments
 (0)