Skip to content

Commit 09f6f00

Browse files
author
pipeline
committed
v21.2.9 is released
1 parent 14be011 commit 09f6f00

File tree

2,557 files changed

+23897
-5316
lines changed

Some content is hidden

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

2,557 files changed

+23897
-5316
lines changed

‎controls/base/CHANGELOG.md

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

33
## [Unreleased]
44

5+
## 21.2.9 (2023-06-06)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `#I461547` - The issue with the "popup showing on the entire page in the Chrome browser on iPad devices" has been resolved.
12+
13+
## 21.1.35 (2023-05-9)
14+
15+
### Common
16+
17+
#### Bug Fixes
18+
19+
- `#I451675` - The issue in the `template engine` when using `boolean` value has been resolved.
20+
521
## 21.2.3 (2023-05-03)
622

723
### Common

‎controls/base/spec/template.spec.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ let arrayOfObj = [
3131
}
3232
];
3333
let specialCharValue = [{'@ShipCountry': 'France'}];
34+
let dsJSONArrayBoolean: any=[{name: true,info:{ id:'01'} }, { name: false, info: { id:'02'} }]
3435
let dsJSONArray: any = [{ name: 'one', info: { id: '01' } }, { name: 'two', info: { id: '02' } }];
3536
let dsSubArray: any = [{ name: 'one', items: ['AR Item1', 'AR Item2'] }, { name: 'two', items: ['AR Item1', 'AR Item2'] }];
3637
let dsJSONSubArray: any = [{ name: 'one', info: { id: '01', items: ['AR Item1', 'AR Item2'] } }, { name: 'two', info: { id: '02', items: ['AR Item1', 'AR Item2'] } }];
@@ -255,6 +256,14 @@ describe('Template', () => {
255256
expect(outDOM(template.compile(templateStr), dsJSONArray)).toEqual(result);
256257
});
257258

259+
it('JSON Array Input With IF ELSE Condition Boolean', () => {
260+
let templateStr: string = '<div>${if(name===true)}${info.id}${else}${name}${/if}</div>';
261+
let result: Element[] = [];
262+
result.push(createElement('div', { innerHTML: '01' }));
263+
result.push(createElement('div', { innerHTML: 'false' }));
264+
expect(outDOM(template.compile(templateStr), dsJSONArrayBoolean)).toEqual(result);
265+
});
266+
258267
it('JSON Array Input With Multiple IF Condition', () => {
259268
let templateStr: string = '<div>${if(name=="one" && info.id != "01")}${info.id}${/if}</div>';
260269
let result: Element[] = [];

‎controls/base/src/browser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export class Browser {
159159

160160
private static getValue(key: string, regX: RegExp): Object {
161161
const browserDetails: {} = typeof window !== 'undefined' ? window.browserDetails : {};
162-
if (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true) {
162+
if (typeof navigator !== 'undefined' && navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && Browser.isTouch === true && !REGX_BROWSER.CHROME.test(navigator.userAgent)) {
163163
browserDetails['isIos'] = true;
164164
browserDetails['isDevice'] = true;
165165
browserDetails['isTouch'] = true;

‎controls/base/src/template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ function evalExp(str: string, nameSpace: string, helper?: Object, ignorePrefix?:
236236
* @returns {string} ?
237237
*/
238238
function addNameSpace(str: string, addNS: boolean, nameSpace: string, ignoreList: string[], ignorePrefix: boolean): string {
239-
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1 && !ignorePrefix) ? nameSpace + '.' + str : str);
239+
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1 && !ignorePrefix && str !== "true" && str !== "false") ? nameSpace + '.' + str : str);
240240
}
241241

242242
/**

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,3 @@ $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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,3 @@ $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/documenteditor/document-editor/icons/_bootstrap-dark.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e98a';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e98a';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap4.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e978';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_bootstrap5.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
color: $icon-color;
5959
content: '\e8bc';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_fabric-dark.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e97e';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_fabric.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e97e';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_fluent.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
.e-de-multi-cmt-mark::before {
5757
content: '\e8bc';
5858
font-family: 'e-icons';
59+
font-size: 14px;
5960
}
6061

6162
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_fusionnew.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
color: $icon-color;
5959
content: '\e8bc';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_highcontrast-light.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
.e-de-multi-cmt-mark::before {
6969
content: '\e97a';
7070
font-family: 'e-icons';
71+
font-size: 14px;
7172
}
7273

7374
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_highcontrast.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
.e-de-multi-cmt-mark::before {
5959
content: '\e97a';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_material-dark.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
.e-de-multi-cmt-mark::before {
6565
content: '\e97a';
6666
font-family: 'e-icons';
67+
font-size: 14px;
6768
}
6869

6970
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_material.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
.e-de-multi-cmt-mark::before {
6565
content: '\e97a';
6666
font-family: 'e-icons';
67+
font-size: 14px;
6768
}
6869

6970
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_material3.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
color: $icon-color;
5959
content: '\e8bc';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_tailwind-dark.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
color: $icon-color;
5959
content: '\e8bc';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

‎controls/base/themestudio/styles/documenteditor/document-editor/icons/_tailwind.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
color: $icon-color;
5959
content: '\e8bc';
6060
font-family: 'e-icons';
61+
font-size: 14px;
6162
}
6263

6364
.e-de-cmt-post::before {

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ $grid-bigger-group-text-line-height: 32px !default;
112112
$grid-bigger-groupcaption-line-height: 32px !default;
113113
$grid-bigger-rtl-group-headercell-margin: 3px 8px 0 0 !default;
114114
$grid-bigger-rtl-group-headercell-padding: 9px 0 4px 0 !default;
115-
$grid-bigger-rtl-ungroup-icon-margin-top: -4px !default;
116115
$grid-bigger-rtl-ungroup-icon-margin-right: -10px !default;
117116
$grid-bigger-textwrap-srotnumber-rightalign-margin: 3px 2px 0 5px !default;
118117
$grid-bigger-textwrap-sorticon-rightalign-margin: -9px 5px !default;
@@ -280,7 +279,7 @@ $grid-rowcell-both-border-width: 1px 0 0 1px !default;
280279
$grid-indentcell-border-width: 0 1px 0 0 !default;
281280
$grid-group-right-arrow-icon-font-size: 10px !default;
282281
$grid-group-right-arrow-icon-padding: 12px 9px 12px 10px !default;
283-
$grid-group-unpgroupicon-margin-top: 2px !default;
282+
$grid-group-unpgroupicon-padding-top: 4px !default;
284283
$grid-summary-cell-line-height: 19px !default;
285284
$grid-batch-updated-bg-color: #d7f9c7 !default;
286285
$grid-val-error-color: #f44336 !default;
@@ -290,7 +289,7 @@ $grid-edit-input-padding-top: 2px !default;
290289
$grid-edit-input-margin: 2px !default;
291290
$grid-edit-cell-padding: 2px !default;
292291
$grid-group-height: 52px !default;
293-
$grid-ungroup-rtl-padding-top: 0 !default;
292+
$grid-ungroup-rtl-padding-top: 4px !default;
294293
$grid-rtl-group-headercell-margin-right: 8px !default;
295294
$grid-rtl-group-headercell-margin-left: 0 !default;
296295
$grid-fltr-rtl-sortnumber-margin: 9px 0 0 9px !default;
@@ -333,10 +332,12 @@ $grid-bigger-headercell-font-size: 15px !default;
333332
$grid-bigger-content-font-size: 14px !default;
334333
$grid-filterbar-border-radius: 4px !default;
335334
$grid-bigger-sorticon-margin-top: -4px !default;
335+
$grid-device-group-sorticon-margin-top: -1px !default;
336336
$grid-header-border-width: 0 !default;
337337
$grid-bigger-groupedcell-padding: 5px 0 8px !default;
338338
$grid-bigger-group-headercell-margin: 4px 0 0 10px !default;
339339
$grid-bigger-group-headercell-padding: 9px 0 !default;
340+
$grid-device-group-headercell-padding: 9px 0 !default;
340341
$grid-bigger-grouptext-marign: 0 !default;
341342
$grid-bigger-headercell-padding: 8px !default;
342343
$grid-bigger-icons-font-size: 14px !default;
@@ -346,8 +347,10 @@ $grid-bigger-grouped-headercell-border-radius: 6px !default;
346347
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
347348
$grid-bigger-ungroupbutton-icons-font-size: 14px !default;
348349
$grid-bigger-groupcell-span-padding: 0 8px !default;
350+
$grid-device-grouped-headercell-span-padding: 0 8px !default;
349351
$grid-bigger-ungroupbutton-icon-margin-left: -7px !default;
350352
$grid-bigger-ungroupbutton-icon-margin-top: -3px !default;
353+
$grid-device-ungroupbutton-icon-margin-top: -3px !default;
351354
$grid-bigger-groupcell-span-line-height: 37px !default;
352355
$grid-bigger-gdownarrow-icon-font-size: 14px !default;
353356
$grid-gd-clone-border-radius: 4px !default;
@@ -480,6 +483,7 @@ $grid-bigger-clone-padding: $grid-clone-padding !default;
480483
$grid-bigger-draganddrop-clone-padding: 0 !default;
481484
$grouped-bigger-text-font-size: 16px !default;
482485
$grid-bigger-ungroupbutton-icon-margin-right: 0 !default;
486+
$grid-bigger-ungroupbutton-icon-padding-top: 0 !default;
483487
$grid-bigger-font-size: $grid-font-size !default;
484488
$grid-rtl-bigger-rightalign-fltrdiv-margin: $grid-rtl-bigger-fltrdiv-margin !default;
485489
$grid-bigger-rtl-ungroup-icon-margin-left: 0 !default;
@@ -589,6 +593,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
589593
$grid-cc-margin-top: 2px !default;
590594
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
591595
$grid-bigger-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
596+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
592597
$grid-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
593598
$grid-ungroup-rtl-padding-left: 8px !default;
594599
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ $grid-bigger-group-text-line-height: 32px !default;
119119
$grid-bigger-groupcaption-line-height: 32px !default;
120120
$grid-bigger-rtl-group-headercell-margin: 3px 8px 0 0 !default;
121121
$grid-bigger-rtl-group-headercell-padding: 9px 0 4px 0 !default;
122-
$grid-bigger-rtl-ungroup-icon-margin-top: -4px !default;
123122
$grid-bigger-rtl-ungroup-icon-margin-right: -10px !default;
124123
$grid-bigger-textwrap-srotnumber-rightalign-margin: 3px 2px 0 5px !default;
125124
$grid-bigger-textwrap-sorticon-rightalign-margin: -9px 5px !default;
@@ -284,7 +283,7 @@ $grid-rowcell-both-border-width: 1px 0 0 1px !default;
284283
$grid-indentcell-border-width: 0 1px 0 0 !default;
285284
$grid-group-right-arrow-icon-font-size: 10px !default;
286285
$grid-group-right-arrow-icon-padding: 12px 9px 12px 10px !default;
287-
$grid-group-unpgroupicon-margin-top: 2px !default;
286+
$grid-group-unpgroupicon-padding-top: 4px !default;
288287
$grid-summary-cell-line-height: 19px !default;
289288
$grid-batch-updated-bg-color: #d7f9c7 !default;
290289
$grid-val-error-color: #f44336 !default;
@@ -294,7 +293,7 @@ $grid-edit-input-padding-top: 2px !default;
294293
$grid-edit-input-margin: 2px !default;
295294
$grid-edit-cell-padding: 2px !default;
296295
$grid-group-height: 52px !default;
297-
$grid-ungroup-rtl-padding-top: 0 !default;
296+
$grid-ungroup-rtl-padding-top: 4px !default;
298297
$grid-rtl-group-headercell-margin-right: 8px !default;
299298
$grid-rtl-group-headercell-margin-left: 0 !default;
300299
$grid-fltr-rtl-sortnumber-margin: 9px 0 0 9px !default;
@@ -337,10 +336,12 @@ $grid-bigger-headercell-font-size: 15px !default;
337336
$grid-bigger-content-font-size: 14px !default;
338337
$grid-filterbar-border-radius: 4px !default;
339338
$grid-bigger-sorticon-margin-top: -4px !default;
339+
$grid-device-group-sorticon-margin-top: -1px !default;
340340
$grid-header-border-width: 0 !default;
341341
$grid-bigger-groupedcell-padding: 5px 0 8px !default;
342342
$grid-bigger-group-headercell-margin: 6px 0 0 12px !default;
343343
$grid-bigger-group-headercell-padding: 9px 0 !default;
344+
$grid-device-group-headercell-padding: 9px 0 !default;
344345
$grid-bigger-grouptext-marign: 0 !default;
345346
$grid-bigger-headercell-padding: 8px !default;
346347
$grid-bigger-icons-font-size: 14px !default;
@@ -350,8 +351,10 @@ $grid-bigger-grouped-headercell-border-radius: 6px !default;
350351
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
351352
$grid-bigger-ungroupbutton-icons-font-size: 14px !default;
352353
$grid-bigger-groupcell-span-padding: 0 8px !default;
354+
$grid-device-grouped-headercell-span-padding: 0 8px !default;
353355
$grid-bigger-ungroupbutton-icon-margin-left: -7px !default;
354356
$grid-bigger-ungroupbutton-icon-margin-top: -3px !default;
357+
$grid-device-ungroupbutton-icon-margin-top: -3px !default;
355358
$grid-bigger-groupcell-span-line-height: 37px !default;
356359
$grid-bigger-gdownarrow-icon-font-size: 14px !default;
357360
$grid-gd-clone-border-radius: 4px !default;
@@ -482,6 +485,7 @@ $grid-bigger-clone-padding: $grid-clone-padding !default;
482485
$grid-bigger-draganddrop-clone-padding: $grid-clone-padding !default;
483486
$grouped-bigger-text-font-size: 16px !default;
484487
$grid-bigger-ungroupbutton-icon-margin-right: 0 !default;
488+
$grid-bigger-ungroupbutton-icon-padding-top: 0 !default;
485489
$grid-bigger-font-size: $grid-font-size !default;
486490
$grid-rtl-bigger-rightalign-fltrdiv-margin: $grid-rtl-bigger-fltrdiv-margin !default;
487491
$grid-bigger-rtl-ungroup-icon-margin-left: 0 !default;
@@ -591,6 +595,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
591595
$grid-cc-margin-top: 2px !default;
592596
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
593597
$grid-bigger-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
598+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
594599
$grid-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
595600
$grid-ungroup-rtl-padding-left: 8px !default;
596601
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ $grid-bigger-group-text-line-height: 3px !default;
117117
$grid-bigger-groupcaption-line-height: 32px !default;
118118
$grid-bigger-rtl-group-headercell-margin: 14px 9px 0 0 !default;
119119
$grid-bigger-rtl-group-headercell-padding: 6px 6px 4px 9px !default;
120-
$grid-bigger-rtl-ungroup-icon-margin-top: 3px !default;
121120
$grid-bigger-rtl-ungroup-icon-margin-right: -15px !default;
122121
$grid-bigger-textwrap-srotnumber-rightalign-margin: 3px 2px 0 5px !default;
123122
$grid-bigger-textwrap-sorticon-rightalign-margin: -9px 5px !default;
@@ -285,7 +284,7 @@ $grid-rowcell-both-border-width: 1px 0 0 1px !default;
285284
$grid-indentcell-border-width: 0 1px 0 0 !default;
286285
$grid-group-right-arrow-icon-font-size: 10px !default;
287286
$grid-group-right-arrow-icon-padding: 12px 9px 12px 10px !default;
288-
$grid-group-unpgroupicon-margin-top: 0 !default;
287+
$grid-group-unpgroupicon-padding-top: 4px !default;
289288
$grid-summary-cell-line-height: 21px !default;
290289
$grid-batch-updated-bg-color: #dcfacf !default;
291290
$grid-val-error-color: #f44336 !default;
@@ -338,22 +337,26 @@ $grid-bigger-headercell-font-size: 16px !default;
338337
$grid-bigger-content-font-size: 16px !default;
339338
$grid-filterbar-border-radius: 4px !default;
340339
$grid-bigger-sorticon-margin-top: -1px !default;
340+
$grid-device-group-sorticon-margin-top: 0 !default;
341341
$grid-header-border-width: 0 !default;
342342
$grid-bigger-groupedcell-padding: 2px 8px 8px !default;
343343
$grid-bigger-group-headercell-margin: 15px 0 0 10px !default;
344344
$grid-bigger-group-headercell-padding: 6px 0 !default;
345+
$grid-device-group-headercell-padding: 0 !default;
345346
$grid-bigger-grouptext-marign: 0 !default;
346347
$grid-bigger-headercell-padding: 12px !default;
347348
$grid-bigger-icons-font-size: 16px !default;
348349
$group-collapse-icon-text-indent: 11px !default;
349350
$grid-bigger-grouparea-font-size: 16px !default;
350351
$grid-bigger-grouped-headercell-border-radius: 6px !default;
351352
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
352-
$grid-bigger-ungroupbutton-icons-font-size: 12px !default;
353+
$grid-bigger-ungroupbutton-icons-font-size: 16px !default;
353354
$grid-bigger-groupcell-span-padding: 8px 4px 10px 12px !default;
355+
$grid-device-grouped-headercell-span-padding: 0 4px 0 12px !default;
354356
$grid-bigger-ungroupbutton-icon-margin-left: -7px !default;
355357
$grid-bigger-ungroupbutton-icon-margin-top: -1px !default;
356-
$grid-bigger-groupcell-span-line-height: 4px !default;
358+
$grid-device-ungroupbutton-icon-margin-top: -1px !default;
359+
$grid-bigger-groupcell-span-line-height: 24px !default;
357360
$grid-bigger-gdownarrow-icon-font-size: 12px !default;
358361
$grid-gd-clone-border-radius: 4px !default;
359362
$grid-bigger-group-clone-broder-radius: 6px !default;
@@ -487,6 +490,7 @@ $grid-bigger-clone-padding: 2px 12px 1px !default;
487490
$grid-bigger-draganddrop-clone-padding: 2px 0 1px !default;
488491
$grouped-bigger-text-font-size: 14px !default;
489492
$grid-bigger-ungroupbutton-icon-margin-right: 8px !default;
493+
$grid-bigger-ungroupbutton-icon-padding-top: 8px !default;
490494
$grid-bigger-font-size: 16px !default;
491495
$grid-rtl-bigger-rightalign-fltrdiv-margin: -20px 0 -18px -54px !default;
492496
$grid-bigger-rtl-ungroup-icon-margin-left: -9px !default;
@@ -595,6 +599,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
595599
$grid-cc-margin-top: 0 !default;
596600
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
597601
$grid-bigger-rtl-group-span-padding: 8px 4px 10px 8px !default;
602+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
598603
$grid-rtl-group-span-padding: 0 8px !default;
599604
$grid-ungroup-rtl-padding-left: 12px !default;
600605
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

0 commit comments

Comments
 (0)