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

Lines changed: 2 additions & 1 deletion
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 3 additions & 0 deletions
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

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 9 additions & 0 deletions
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

Lines changed: 3 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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;

0 commit comments

Comments
 (0)