Skip to content

Commit a037deb

Browse files
author
pipeline
committed
v20.3.61 is released
1 parent 48cc764 commit a037deb

File tree

427 files changed

+7699
-6523
lines changed

Some content is hidden

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

427 files changed

+7699
-6523
lines changed

‎controls/base/src/draggable.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,8 @@ export class Draggable extends Base<HTMLElement> implements INotifyPropertyChang
997997
let intCoord: Coordinates = this.getCoordinates(evt);
998998
let ele: HTMLElement;
999999
let prevStyle: string = this.helperElement.style.pointerEvents || '';
1000-
if (compareElementParent(evt.target as Element, this.helperElement) || evt.type.indexOf('touch') !== -1) {
1000+
let isPointer: boolean = evt.type.indexOf('pointer') !== -1 && Browser.info.name === 'safari' && parseInt(Browser.info.version) > 12 ;
1001+
if (compareElementParent(evt.target as Element, this.helperElement) || evt.type.indexOf('touch') !== -1 || isPointer) {
10011002
this.helperElement.style.pointerEvents = 'none';
10021003
ele = <HTMLElement>document.elementFromPoint(intCoord.clientX, intCoord.clientY);
10031004
this.helperElement.style.pointerEvents = prevStyle;

‎controls/base/styles/definition/_material.scss

+3
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,6 @@ $appbar-hover-bg-color-alt2: rgba(255, 255, 255, .08) !default;
145145
//shadow
146146
$appbar-bottom-shadow: 0 2px 4px rgba(0, 0, 0, .1), 0 2px 6px rgba(0, 0, 0, .16) !default;
147147
$appbar-top-shadow: 0 -2px 3px rgba(0, 0, 0, .1), 0 -2px 6px rgba(0, 0, 0, .2) !default;
148+
149+
//TreeView
150+
$tree-node-text-color:#cc1351 !default;

‎controls/base/themestudio/styles/base/definition/_material.scss

+3
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,6 @@ $appbar-hover-bg-color-alt2: rgba(255, 255, 255, .08) !default;
145145
//shadow
146146
$appbar-bottom-shadow: 0 2px 4px rgba(0, 0, 0, .1), 0 2px 6px rgba(0, 0, 0, .16) !default;
147147
$appbar-top-shadow: 0 -2px 3px rgba(0, 0, 0, .1), 0 -2px 6px rgba(0, 0, 0, .2) !default;
148+
149+
//TreeView
150+
$tree-node-text-color:#cc1351 !default;

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

+3-3
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/base/themestudio/styles/buttons/check-box/_theme.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
&:not(.e-check):not(.e-stop) {
104104
color: $cbox-icon-color;
105-
@media (hover: none) {
105+
@media (max-width: 768px) {
106106
color: $cbox-bgcolor;
107107
}
108108
}

‎controls/base/themestudio/styles/buttons/speed-dial/_layout.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@include export-module('speed-dial-layout') {
22
.e-speeddial-popup {
3-
pointer-events: none;
43
position: absolute;
4+
z-index: 99999;
55

66
&.e-speeddial-top {
77
top: $sd-offset;

‎controls/base/themestudio/styles/dropdowns/multi-select/_layout.scss

+4
Original file line numberDiff line numberDiff line change
@@ -2000,3 +2000,7 @@ ejs-multiselect {
20002000
.e-multiselect.e-readonly.e-control-wrapper.e-input-group.e-control-container.e-input-group :not(.e-disabled).e-multi-select-wrapper:hover .e-clear-icon {
20012001
display: none;
20022002
}
2003+
2004+
.e-multiselect.e-input-group.e-control-wrapper .e-input-group-icon {
2005+
margin-right: 0;
2006+
}

‎controls/base/themestudio/styles/filemanager/file-manager/_layout.scss

+9
Original file line numberDiff line numberDiff line change
@@ -1812,6 +1812,15 @@
18121812
}
18131813
}
18141814

1815+
@media (min-width: 360px) and (max-width: 500px) {
1816+
@if $skin-name == 'FluentUI' {
1817+
.e-bigger .e-filemanager .e-grid .e-checkbox-wrapper .e-frame {
1818+
position: relative;
1819+
right: 10px;
1820+
}
1821+
}
1822+
}
1823+
18151824
.e-content-placeholder.e-filemanager.e-placeholder-filemanager {
18161825
height: 100%;
18171826
width: 100%;

‎controls/base/themestudio/styles/gantt/gantt/_layout.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -622,12 +622,12 @@
622622
}
623623

624624
.e-zero-spacing {
625-
border-spacing: 0;
625+
border-spacing: .25px;
626626
}
627627

628628
.e-chart-row:first-child .e-chart-row-border {
629629
//border-width: 0;
630-
border-top-color: transparent;
630+
border-top: 0;
631631
}
632632

633633
.e-chart-row {
@@ -907,6 +907,7 @@
907907

908908
.e-task-table {
909909
overflow: hidden;
910+
border-collapse: separate;
910911
}
911912

912913
.e-left-resize-gripper,

‎controls/base/themestudio/styles/grids/grid/_bootstrap-dark-definition.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
559559
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
560560
$grid-reorderarrow-margin-top: -6.5px !default;
561561
$grid-reorderdownarrow-margin-top: 4px !default;
562-
$grid-reorder-arrow-top-margin: -1.5px !default;
562+
$grid-reorder-arrow-top-margin: .5px !default;
563563
$grid-reorder-downarrow-top-margin: -1.5px !default;
564564
$grid-sortnumber-font-size: 9px !default;
565565
$grid-header-text-transform: none !default;

‎controls/base/themestudio/styles/grids/grid/_bootstrap-definition.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
561561
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
562562
$grid-reorderarrow-margin-top: -6.5px !default;
563563
$grid-reorderdownarrow-margin-top: 4px !default;
564-
$grid-reorder-arrow-top-margin: -1.5px !default;
564+
$grid-reorder-arrow-top-margin: .5px !default;
565565
$grid-reorder-downarrow-top-margin: -1.5px !default;
566566
$grid-sortnumber-font-size: 9px !default;
567567
$grid-header-text-transform: none !default;

‎controls/base/themestudio/styles/grids/grid/_bootstrap4-definition.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
565565
$grid-rowcell-color: $grid-content-font-color !default !default;
566566
$grid-reorderarrow-margin-top: -7.5px !default;
567567
$grid-reorderdownarrow-margin-top: 2.5px !default;
568-
$grid-reorder-arrow-top-margin: -1px !default;
568+
$grid-reorder-arrow-top-margin: 0 !default;
569569
$grid-reorder-downarrow-top-margin: -3px !default;
570570
$grid-sortnumber-font-size: 9px !default;
571571
$grid-header-text-transform: none !default;

‎controls/base/themestudio/styles/grids/grid/_bootstrap5-definition.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ $grid-sortnumber-font-size: 14px !default;
563563
$grid-reorderarrow-margin-top: -7px !default;
564564
$grid-reorderdownarrow-margin-top: 4px !default;
565565
$grid-reorder-arrow-top-margin: 0 !default;
566-
$grid-reorder-downarrow-top-margin: 0 !default;
566+
$grid-reorder-downarrow-top-margin: -2px !default;
567567
$grid-bigger-toolbar-icon-size: $grid-bigger-icons-font-size !default;
568568
$grid-reorderarrow-margin-left: -3px !default;
569569
$grid-column-chooser-cancel-icon-size: $text-sm !default;

‎controls/base/themestudio/styles/grids/grid/_fabric-dark-definition.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
557557
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
558558
$grid-reorderarrow-margin-top: -4.5px !default;
559559
$grid-reorderdownarrow-margin-top: 4px !default;
560-
$grid-reorder-arrow-top-margin: 0 !default;
561-
$grid-reorder-downarrow-top-margin: 0 !default;
560+
$grid-reorder-arrow-top-margin: 1px !default;
561+
$grid-reorder-downarrow-top-margin: -1px !default;
562562
$grid-sortnumber-font-size: 9px !default;
563563
$grid-header-text-transform: none !default;
564564
$grid-bigger-toolbar-icon-size: 18px !default;

‎controls/base/themestudio/styles/grids/grid/_fabric-definition.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
557557
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
558558
$grid-reorderarrow-margin-top: -4.5px !default;
559559
$grid-reorderdownarrow-margin-top: 4px !default;
560-
$grid-reorder-arrow-top-margin: 0 !default;
561-
$grid-reorder-downarrow-top-margin: 0 !default;
560+
$grid-reorder-arrow-top-margin: 1px !default;
561+
$grid-reorder-downarrow-top-margin: -1px !default;
562562
$grid-sortnumber-font-size: 9px !default;
563563
$grid-header-text-transform: none !default;
564564
$grid-bigger-toolbar-icon-size: 18px !default;

‎controls/base/themestudio/styles/grids/grid/_fluent-definition.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ $grid-sortnumber-font-size: 12px !default;
558558
$grid-reorderarrow-margin-top: -6.5px !default;
559559
$grid-reorderdownarrow-margin-top: 4.5px !default;
560560
$grid-reorder-arrow-top-margin: 0 !default;
561-
$grid-reorder-downarrow-top-margin: 0 !default;
561+
$grid-reorder-downarrow-top-margin: -1px !default;
562562
$grid-bigger-toolbar-icon-size: $grid-bigger-icons-font-size !default;
563563
$grid-reorderarrow-margin-left: -2px !default;
564564
$grid-column-chooser-cancel-icon-size: 10px !default;

‎controls/base/themestudio/styles/grids/grid/_highcontrast-definition.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
557557
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
558558
$grid-reorderarrow-margin-top: -5px !default;
559559
$grid-reorderdownarrow-margin-top: 4px !default;
560-
$grid-reorder-arrow-top-margin: 0 !default;
561-
$grid-reorder-downarrow-top-margin: 0 !default;
560+
$grid-reorder-arrow-top-margin: 2px !default;
561+
$grid-reorder-downarrow-top-margin: -1px !default;
562562
$grid-sortnumber-font-size: 9px !default;
563563
$grid-header-text-transform: none !default;
564564
$grid-bigger-toolbar-icon-size: 18px !default;

‎controls/base/themestudio/styles/grids/grid/_layout.scss

+14-3
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,18 @@
934934
}
935935
}
936936

937+
& .e-toolbar-items{
938+
& .e-input-group-icon.e-icons.e-sicon:hover:not(.e-clear-icon),
939+
& .e-input-group-icon.e-icons.e-sicon:active:not(.e-clear-icon),
940+
& .e-input-group-icon.e-icons.e-sicon:focus:not(.e-clear-icon) {
941+
background: none;
942+
box-shadow: none;
943+
}
944+
& .e-input-group-icon.e-icons.e-sicon:not(.e-clear-icon) {
945+
border: none;
946+
}
947+
}
948+
937949
.e-res-toolbar {
938950
border-bottom: 1px solid;
939951
border-bottom-color: $grid-header-border-color;
@@ -1631,6 +1643,7 @@
16311643
}
16321644

16331645
&.e-responsive .e-rowcell.e-gridchkbox,
1646+
&.e-responsive .e-rowcell.e-gridchkbox-cell,
16341647
&.e-responsive .e-headercelldiv.e-headerchkcelldiv {
16351648
text-overflow: clip;
16361649
}
@@ -2485,14 +2498,12 @@
24852498
font-size: $grid-group-down-arrow-icon-font-size;
24862499
padding: $grid-group-down-arrow-icon-padding;
24872500
text-decoration: none;
2488-
text-indent: $group-collapse-icon-text-indent;
24892501
}
24902502

24912503
.e-icon-grightarrow {
24922504
font-size: $grid-group-right-arrow-icon-font-size;
24932505
padding: $grid-group-right-arrow-icon-padding;
24942506
text-decoration: none;
2495-
text-indent: $group-expand-icon-text-indent;
24962507
}
24972508

24982509
.e-recordplusexpand {
@@ -3699,7 +3710,7 @@
36993710

37003711
.e-gridheader .e-headercontent .e-reorderuparrow {
37013712
@if $grid-skin == 'fluent' or $grid-skin == 'bootstrap5' {
3702-
margin-top: -9px;
3713+
margin-top: -2px;
37033714
}
37043715
}
37053716

‎controls/base/themestudio/styles/grids/grid/_material-dark-definition.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
557557
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
558558
$grid-reorderarrow-margin-top: -4.5px !default;
559559
$grid-reorderdownarrow-margin-top: 4.5px !default;
560-
$grid-reorder-arrow-top-margin: 0 !default;
561-
$grid-reorder-downarrow-top-margin: 0 !default;
560+
$grid-reorder-arrow-top-margin: 1px !default;
561+
$grid-reorder-downarrow-top-margin: -1px !default;
562562
$grid-sortnumber-font-size: 9px !default;
563563
$grid-header-text-transform: none !default;
564564
$grid-bigger-toolbar-icon-size: 18px !default;

‎controls/base/themestudio/styles/grids/grid/_material-definition.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -555,8 +555,8 @@ $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
555555
$grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
556556
$grid-reorderarrow-margin-top: -4.5px !default;
557557
$grid-reorderdownarrow-margin-top: 4.5px !default;
558-
$grid-reorder-arrow-top-margin: 0 !default;
559-
$grid-reorder-downarrow-top-margin: 0 !default;
558+
$grid-reorder-arrow-top-margin: 1px !default;
559+
$grid-reorder-downarrow-top-margin: -1px !default;
560560
$grid-sortnumber-font-size: 9px !default;
561561
$grid-header-text-transform: none !default;
562562
$grid-bigger-toolbar-icon-size: 18px !default;

‎controls/base/themestudio/styles/grids/grid/_tailwind-definition.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@ $grid-adatptive-apply-btn-disable: $primary-bg-color-disabled !default;
568568
$grid-sortnumber-font-size: $text-xxs !default;
569569
$grid-reorderarrow-margin-top: -11px !default;
570570
$grid-reorderdownarrow-margin-top: 1px !default;
571-
$grid-reorder-arrow-top-margin: -11px !default;
572-
$grid-reorder-downarrow-top-margin: 1px !default;
571+
$grid-reorder-arrow-top-margin: -4px !default;
572+
$grid-reorder-downarrow-top-margin: -5px !default;
573573
$grid-bigger-toolbar-icon-size: $grid-bigger-icons-font-size !default;
574574
$grid-reorderarrow-margin-left: -6px !default;
575575
$grid-column-chooser-cancel-icon-size: $text-sm !default;

‎controls/base/themestudio/styles/icons/bootstrap4.scss

+598-598
Large diffs are not rendered by default.

‎controls/base/themestudio/styles/icons/bootstrap5.scss

+456-456
Large diffs are not rendered by default.

‎controls/base/themestudio/styles/icons/fluent.scss

+456-456
Large diffs are not rendered by default.

‎controls/base/themestudio/styles/icons/fusion.scss

+466-466
Large diffs are not rendered by default.

‎controls/base/themestudio/styles/navigations/context-menu/_layout.scss

-3
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@
131131

132132
& .e-menu-item {
133133
@include bigger-li-size;
134-
@if $skin-name == 'tailwind' or $skin-name == 'bootstrap5' or $skin-name == 'FluentUI' {
135-
padding: $cmenu-bigger-li-padding;
136-
}
137134

138135
& .e-caret {
139136
font-size: $cmenu-bigger-caret-font-size;

‎controls/base/themestudio/styles/navigations/menu/_theme.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
@at-root {
1010
& .e-menu {
11-
@if $skin-name == 'bootstrap4' {
11+
@if $skin-name == 'bootstrap4' or $skin-name == 'FluentUI' {
1212
background-color: $cmenu-ul-bgcolor;
1313
}
1414
@else {

‎controls/base/themestudio/styles/navigations/tab/_layout.scss

+6-19
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
height: auto;
1414
min-height: auto;
1515

16-
@if $tab-skin == 'bootstrap' or $tab-skin == 'bootstrap4' or $tbar-skin == 'bootstrap5' or $tbar-skin == 'FluentUI' {
17-
height: $tab-big-height;
18-
min-height: $tab-big-height;
19-
}
20-
2116
&:not(.e-tbar-pos) .e-toolbar-item:first-child,
2217
&:not(.e-tbar-pos) .e-toolbar-item:last-child {
2318
margin: $tab-big-first-item-margin;
@@ -733,11 +728,11 @@
733728

734729
&.e-vertical-icon {
735730

736-
.e-tab-header {
731+
> .e-tab-header {
737732
height: $tab-big-tb-icon-height;
738733
min-height: $tab-big-tb-icon-height;
739734

740-
.e-toolbar-items {
735+
> .e-toolbar-items {
741736
height: $tab-big-tb-icon-height;
742737
}
743738

@@ -1213,7 +1208,7 @@
12131208

12141209
&.e-vertical-icon {
12151210

1216-
.e-tab-header {
1211+
> .e-tab-header {
12171212
height: $tab-big-tb-icon-height - 2;
12181213
min-height: $tab-big-tb-icon-height - 2;
12191214
}
@@ -1490,16 +1485,8 @@
14901485
min-height: $tab-nrml-height;
14911486
position: relative;
14921487

1493-
@if $tab-skin == 'bootstrap' or $tab-skin == 'bootstrap4' or $tbar-skin == 'bootstrap5' or $tbar-skin == 'FluentUI' {
1494-
height: $tab-nrml-height;
1495-
min-height: $tab-nrml-height;
1496-
}
1497-
14981488
@media screen and (max-width: 480px) {
14991489
min-height: $tab-big-height;
1500-
@if $tab-skin == 'bootstrap' or $tab-skin == 'bootstrap4' or $tbar-skin == 'bootstrap5' {
1501-
height: $tab-big-height;
1502-
}
15031490
}
15041491

15051492
&:not(.e-tbar-pos) .e-toolbar-item:first-child,
@@ -2808,7 +2795,7 @@
28082795

28092796
&.e-vertical-icon {
28102797

2811-
.e-tab-header {
2798+
> .e-tab-header {
28122799
height: $tab-nrml-tb-icon-height;
28132800
min-height: $tab-nrml-tb-icon-height;
28142801

@@ -2820,7 +2807,7 @@
28202807
}
28212808
}
28222809

2823-
.e-toolbar-items {
2810+
> .e-toolbar-items {
28242811
height: $tab-nrml-tb-icon-height;
28252812
}
28262813

@@ -3456,7 +3443,7 @@
34563443

34573444
&.e-vertical-icon {
34583445

3459-
.e-tab-header {
3446+
> .e-tab-header {
34603447
height: $tab-nrml-tb-icon-height - 2;
34613448
min-height: $tab-nrml-tb-icon-height - 2;
34623449
}

‎controls/base/themestudio/styles/navigations/treeview/_material-definition.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $treeview-text-color: rgba($grey-light-font, .87) !default;
1212
$treeview-item-border-color: transparent !default;
1313
$treeview-item-active-bg: $grey-200 !default;
1414
$treeview-icon-active-color: rgba($grey-light-font, .54) !default;
15-
$treeview-text-active-color: $accent !default;
15+
$treeview-text-active-color: $tree-node-text-color !default;
1616
$treeview-item-active-border-color: $grey-200 !default;
1717
$treeview-item-hover-bg: $grey-100 !default;
1818
$treeview-icon-hover-color: rgba($grey-light-font, .54) !default;

0 commit comments

Comments
 (0)