Skip to content

Commit df8e2ab

Browse files
author
pipeline
committed
v20.3.58 is released
1 parent ec17e92 commit df8e2ab

File tree

517 files changed

+9202
-5256
lines changed

Some content is hidden

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

517 files changed

+9202
-5256
lines changed

controls/buttons/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## 20.3.58 (2022-11-22)
6+
7+
### Checkbox
8+
9+
#### Bug Fixes
10+
11+
- The Issue with the checkbox label size in the Fluent theme has been fixed.
12+
513
## 20.3.57 (2022-11-15)
614

715
### Chips

controls/buttons/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-buttons",
3-
"version": "20.3.56",
3+
"version": "20.3.57",
44
"description": "A package of feature-rich Essential JS 2 components such as Button, CheckBox, RadioButton and Switch.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/buttons/styles/check-box/_fluent-definition.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
//layout variables
22
$cbox-bigger-check-fontsize: 18px !default;
3-
$cbox-bigger-font-size: 18px !default;
3+
$cbox-bigger-font-size: 16px !default;
44
$cbox-bigger-height: 24px !default;
55
$cbox-bigger-indeterminate-fontsize: 20px !default;
66
$cbox-bigger-indeterminate-lineheight: 23px !default;
77
$cbox-bigger-lineheight: 22px !default;
88
$cbox-bigger-margin: 12px !default;
99
$cbox-bigger-small-check-fontsize: 16px !default;
10-
$cbox-bigger-small-font-size: 16px !default;
10+
$cbox-bigger-small-font-size: 14px !default;
1111
$cbox-bigger-small-height: 22px !default;
1212
$cbox-bigger-small-indeterminate-fontsize: 16px !default;
1313
$cbox-bigger-small-indeterminate-lineheight: 21px !default;
1414
$cbox-bigger-small-lineheight: 21px !default;
1515
$cbox-bigger-small-width: 22px !default;
1616
$cbox-bigger-width: 24px !default;
1717
$cbox-border: 1px solid !default;
18-
$cbox-font-size: 16px !default;
18+
$cbox-font-size: 14px !default;
1919
$cbox-height: 20px !default;
2020
$cbox-border-radius: $inputs-radius !default;
2121
$cbox-check-fontsize: 16px !default;

controls/buttons/themestudio/styles/buttons/check-box/_fluent-definition.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
//layout variables
22
$cbox-bigger-check-fontsize: 18px !default;
3-
$cbox-bigger-font-size: 18px !default;
3+
$cbox-bigger-font-size: 16px !default;
44
$cbox-bigger-height: 24px !default;
55
$cbox-bigger-indeterminate-fontsize: 20px !default;
66
$cbox-bigger-indeterminate-lineheight: 23px !default;
77
$cbox-bigger-lineheight: 22px !default;
88
$cbox-bigger-margin: 12px !default;
99
$cbox-bigger-small-check-fontsize: 16px !default;
10-
$cbox-bigger-small-font-size: 16px !default;
10+
$cbox-bigger-small-font-size: 14px !default;
1111
$cbox-bigger-small-height: 22px !default;
1212
$cbox-bigger-small-indeterminate-fontsize: 16px !default;
1313
$cbox-bigger-small-indeterminate-lineheight: 21px !default;
1414
$cbox-bigger-small-lineheight: 21px !default;
1515
$cbox-bigger-small-width: 22px !default;
1616
$cbox-bigger-width: 24px !default;
1717
$cbox-border: 1px solid !default;
18-
$cbox-font-size: 16px !default;
18+
$cbox-font-size: 14px !default;
1919
$cbox-height: 20px !default;
2020
$cbox-border-radius: $inputs-radius !default;
2121
$cbox-check-fontsize: 16px !default;

controls/buttons/themestudio/styles/grids/grid/_layout.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,6 +1631,7 @@
16311631
}
16321632

16331633
&.e-responsive .e-rowcell.e-gridchkbox,
1634+
&.e-responsive .e-rowcell.e-gridchkbox-cell,
16341635
&.e-responsive .e-headercelldiv.e-headerchkcelldiv {
16351636
text-overflow: clip;
16361637
}

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_bootstrap-dark-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $bigger-cpicker-btn-width: 36px !default;
8080
$menu-extension-padding: 12px !default;
8181
$ribbon-item-hover-border-color: $tbar-hover-border-color !default;
8282
$ribbon-item-active-border-color: $tbar-focus-border-color !default;
83-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
83+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8484
$normal-btn-padding: 8px !default;
8585

8686
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_bootstrap-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $bigger-cpicker-btn-width: 36px !default;
8080
$menu-extension-padding: 12px !default;
8181
$ribbon-item-hover-border-color: $tbar-hover-border-color !default;
8282
$ribbon-item-active-border-color: $tbar-focus-border-color !default;
83-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
83+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8484
$normal-btn-padding: 8px !default;
8585

8686
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_bootstrap4-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $bigger-cpicker-btn-width: 33px !default;
7979
$menu-extension-padding: 8px !default;
8080
$ribbon-item-hover-border-color: $tbar-hover-border-color !default;
8181
$ribbon-item-active-border-color: $tbar-focus-border-color !default;
82-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
82+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8383
$normal-btn-padding: 8px !default;
8484

8585
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_bootstrap5-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $bigger-cpicker-btn-width: 36px !default;
8181
$menu-extension-padding: 12px !default;
8282
$ribbon-item-hover-border-color: transparent !default;
8383
$ribbon-item-active-border-color: transparent !default;
84-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
84+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8585
$normal-btn-padding: 8px !default;
8686

8787
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_fabric-dark-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $bigger-cpicker-btn-width: 45px !default;
7777
$menu-extension-padding: 10px !default;
7878
$ribbon-item-hover-border-color: transparent !default;
7979
$ribbon-item-active-border-color: transparent !default;
80-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
80+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8181
$normal-btn-padding: 8px !default;
8282

8383
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_fabric-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $bigger-cpicker-btn-width: 45px !default;
7777
$menu-extension-padding: 10px !default;
7878
$ribbon-item-hover-border-color: transparent !default;
7979
$ribbon-item-active-border-color: transparent !default;
80-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
80+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8181
$normal-btn-padding: 8px !default;
8282

8383
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_fluent-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $bigger-cpicker-btn-width: 36px !default;
8181
$menu-extension-padding: 12px !default;
8282
$ribbon-item-hover-border-color: transparent !default;
8383
$ribbon-item-active-border-color: transparent !default;
84-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
84+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8585
$normal-btn-padding: 8px !default;
8686

8787
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_fusionnew-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $bigger-cpicker-btn-width: 36px !default;
8181
$menu-extension-padding: 12px !default;
8282
$ribbon-item-hover-border-color: transparent !default;
8383
$ribbon-item-active-border-color: transparent !default;
84-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
84+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8585
$normal-btn-padding: 8px !default;
8686

8787
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_highcontrast-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $bigger-cpicker-btn-width: 45px !default;
7777
$menu-extension-padding: 10px !default;
7878
$ribbon-item-hover-border-color: $tbar-hover-border-color !default;
7979
$ribbon-item-active-border-color: $tbar-focus-border-color !default;
80-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
80+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8181
$normal-btn-padding: 8px !default;
8282

8383
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_highcontrast-light-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ $bigger-cpicker-btn-width: 45px !default;
6969
$menu-extension-padding: 10px !default;
7070
$ribbon-item-hover-border-color: transparent !default;
7171
$ribbon-item-active-border-color: transparent !default;
72-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
72+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
7373
$normal-btn-padding: 8px !default;
7474

7575
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_material-dark-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $bigger-cpicker-btn-width: 31px !default;
8080
$menu-extension-padding: 10px !default;
8181
$ribbon-item-hover-border-color: transparent !default;
8282
$ribbon-item-active-border-color: transparent !default;
83-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
83+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8484
$normal-btn-padding: 7px !default;
8585

8686
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_material-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ $bigger-cpicker-btn-width: 31px !default;
7878
$menu-extension-padding: 10px !default;
7979
$ribbon-item-hover-border-color: transparent !default;
8080
$ribbon-item-active-border-color: transparent !default;
81-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
81+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8282
$normal-btn-padding: 7px !default;
8383

8484
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_material3-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $bigger-cpicker-btn-width: 36px !default;
8181
$menu-extension-padding: 12px !default;
8282
$ribbon-item-hover-border-color: transparent !default;
8383
$ribbon-item-active-border-color: transparent !default;
84-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
84+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8585
$normal-btn-padding: 8px !default;
8686

8787
//End Ribbon

controls/buttons/themestudio/styles/spreadsheet/spreadsheet/_tailwind-definition.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ $bigger-cpicker-btn-width: 36px !default;
8181
$menu-extension-padding: 12px !default;
8282
$ribbon-item-hover-border-color: transparent !default;
8383
$ribbon-item-active-border-color: transparent !default;
84-
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
84+
$font-family-collection: ('Arial', 'Arial Black', 'Axettac Demo', 'Batang', 'Book Antiqua', 'Calibri', 'Comic Sans MS', 'Courier', 'Courier New', 'Din Condensed', 'Georgia', 'Helvetica', 'Helvetica New', 'Roboto', 'Tahoma', 'Times New Roman', 'Verdana') !default;
8585
$normal-btn-padding: 8px !default;
8686

8787
//End Ribbon
Binary file not shown.

controls/calendars/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 20.3.57 (2022-11-15)
5+
## 20.3.50 (2022-10-18)
66

77
### Calendar
88

controls/calendars/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-calendars",
3-
"version": "20.3.49",
3+
"version": "20.3.56",
44
"description": "A complete package of date or time components with built-in features such as date formatting, inline editing, multiple (range) selection, range restriction, month and year selection, strict mode, and globalization.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/calendars/src/calendar/calendar.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,9 @@ export class CalendarBase extends Component<HTMLElement> implements INotifyPrope
464464
'data-role': 'calendar'
465465
});
466466
}
467+
if (!isNullOrUndefined(closest(this.element, "fieldset") as HTMLFieldSetElement) && (closest(this.element, "fieldset") as HTMLFieldSetElement).disabled) {
468+
this.enabled = false;
469+
}
467470
this.createHeader();
468471
this.createContent();
469472
this.wireEvents();

controls/calendars/src/datepicker/datepicker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,9 @@ export class DatePicker extends Calendar implements IInput {
462462
if (!isNullOrUndefined(this.inputWrapper.buttons[0]) && !isNullOrUndefined(this.inputWrapper.container.getElementsByClassName('e-float-text-overflow')[0]) && this.floatLabelType !== 'Never') {
463463
this.inputWrapper.container.getElementsByClassName('e-float-text-overflow')[0].classList.add('e-icon');
464464
}
465+
if (!isNullOrUndefined(closest(this.element, "fieldset") as HTMLFieldSetElement) && (closest(this.element, "fieldset") as HTMLFieldSetElement).disabled) {
466+
this.enabled = false;
467+
}
465468
this.renderComplete();
466469
this.setTimeZone(this.serverTimezoneOffset);
467470
}

controls/calendars/src/daterangepicker/daterangepicker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,9 @@ export class DateRangePicker extends CalendarBase {
742742
if (!isNullOrUndefined(this.inputWrapper.buttons[0]) && !isNullOrUndefined(this.inputWrapper.container.getElementsByClassName('e-float-text-overflow')[0]) && this.floatLabelType !== 'Never') {
743743
this.inputWrapper.container.getElementsByClassName('e-float-text-overflow')[0].classList.add('e-icon');
744744
}
745+
if (!isNullOrUndefined(closest(this.element, "fieldset") as HTMLFieldSetElement) && (closest(this.element, "fieldset") as HTMLFieldSetElement).disabled) {
746+
this.enabled = false;
747+
}
745748
this.renderComplete();
746749
}
747750
/**

controls/calendars/src/datetimepicker/datetimepicker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,9 @@ export class DateTimePicker extends DatePicker {
658658
this.cloneElement = <HTMLElement>this.element.cloneNode(true);
659659
this.dateTimeFormat = this.cldrDateTimeFormat();
660660
this.initValue = this.value;
661+
if (!isNullOrUndefined(closest(this.element, "fieldset") as HTMLFieldSetElement) && (closest(this.element, "fieldset") as HTMLFieldSetElement).disabled) {
662+
this.enabled = false;
663+
}
661664
super.updateHtmlAttributeToElement();
662665
this.checkAttributes(false);
663666
const localeText: { placeholder: string } = { placeholder: this.placeholder };

controls/calendars/src/timepicker/timepicker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,9 @@ export class TimePicker extends Component<HTMLElement> implements IInput {
638638
if (!isNullOrUndefined(this.inputWrapper.buttons[0]) && !isNullOrUndefined(this.inputWrapper.container.getElementsByClassName('e-float-text-overflow')[0]) && this.floatLabelType !== 'Never') {
639639
this.inputWrapper.container.getElementsByClassName('e-float-text-overflow')[0].classList.add('e-icon');
640640
}
641+
if (!isNullOrUndefined(closest(this.element, "fieldset") as HTMLFieldSetElement) && (closest(this.element, "fieldset") as HTMLFieldSetElement).disabled) {
642+
this.enabled = false;
643+
}
641644
this.renderComplete();
642645
}
643646
private setTimeAllowEdit(): void {

controls/calendars/themestudio/styles/buttons/check-box/_theme.scss

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

103103
&:not(.e-check):not(.e-stop) {
104104
color: $cbox-icon-color;
105+
@media (max-width: 768px) {
106+
color: $cbox-bgcolor;
107+
}
105108
}
106109

107110
&:not(.e-check),

controls/calendars/themestudio/styles/buttons/floating-action-button/_tailwind-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ $fab-bigger-small-padding: 0 17px !default;
2525
$fab-bigger-small-icon-font-size: 14px !default;
2626

2727
$fab-box-shadow: 0 4px 6px -1px rgba(0, 0, 0, .2), 0 -2px 15px -3px rgba(0, 0, 0, .1), 0 6px 10px rgba(0, 0, 0, .14) !default;
28+
$fab-focus-box-shadow: $fab-box-shadow, $shadow-focus-ring2 !default;

controls/calendars/themestudio/styles/buttons/floating-action-button/_theme.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@
44
box-shadow: $fab-box-shadow;
55

66
&:hover,
7-
&:focus,
87
&:active,
98
&.e-active,
109
&:disabled {
1110
box-shadow: $fab-box-shadow;
1211
}
12+
13+
&:focus {
14+
@if ($skin-name != 'tailwind' and $skin-name != 'tailwind-dark' and $skin-name != 'bootstrap4' and $skin-name != 'bootstrap5' and $skin-name != 'bootstrap5-dark') {
15+
box-shadow: $fab-box-shadow;
16+
}
17+
@if ($skin-name == 'tailwind') {
18+
box-shadow: $fab-focus-box-shadow;
19+
}
20+
}
1321
}
1422
}

controls/calendars/themestudio/styles/buttons/speed-dial/_bootstrap-dark-definition.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $sd-li-text-padding: 0 5px !default;
55
//Distance between vertical menu and button => Ul bottom padding + li bottom margin
66
//Distance between vertical menu item => li bottom margin + li top margin
77
//Horizontal padding for vertical menu => ((fab wdith - li icon width)/2) - 1 px (for icon border)
8-
$sd-horz-ul-padding: 5px 4px !default;
9-
$sd-vert-ul-padding: 4px 5px !default;
8+
$sd-horz-ul-padding: 3px 4px !default;
9+
$sd-vert-ul-padding: 4px 3px !default;
1010
$sd-horz-li-margin: 0 4px !default;
1111
$sd-vert-li-margin: 4px 0 !default;
1212
$sd-li-text-margin: 0 8px !default;

controls/calendars/themestudio/styles/buttons/speed-dial/_bootstrap-definition.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $sd-li-text-padding: 0 5px !default;
55
//Distance between vertical menu and button => Ul bottom padding + li bottom margin
66
//Distance between vertical menu item => li bottom margin + li top margin
77
//Horizontal padding for vertical menu => ((fab wdith - li icon width)/2) - 1 px (for icon border)
8-
$sd-horz-ul-padding: 5px 4px !default;
9-
$sd-vert-ul-padding: 4px 5px !default;
8+
$sd-horz-ul-padding: 3px 4px !default;
9+
$sd-vert-ul-padding: 4px 3px !default;
1010
$sd-horz-li-margin: 0 4px !default;
1111
$sd-vert-li-margin: 4px 0 !default;
1212
$sd-li-text-margin: 0 8px !default;

controls/calendars/themestudio/styles/buttons/speed-dial/_bootstrap5-definition.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ $sd-disabled-font-color: $content-text-color-disabled !default;
5555
$sd-focus-li-bg: $content-bg-color-focus !default;
5656
$sd-focus-li-border-color: $border-focus !default;
5757
$sd-focus-font-color: $content-text-color-focus !default;
58+
$sd-focus-box-shadow: $secondary-shadow-focus !default;
5859

5960
$sd-hover-li-bg: $content-bg-color-hover !default;
6061
$sd-hover-li-border-color: $border-hover !default;
6162
$sd-hover-font-color: $content-text-color-hover !default;
6263

63-
$sd-active-li-bg: $content-text-color-pressed !default;
64+
$sd-active-li-bg: $content-bg-color-pressed !default;
6465
$sd-active-li-border-color: $content-bg-color-pressed !default;
6566
$sd-active-font-color: $content-text-color-focus !default;

0 commit comments

Comments
 (0)