Skip to content

Commit bf323f0

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 12d2671 commit bf323f0

File tree

10 files changed

+139
-89
lines changed

10 files changed

+139
-89
lines changed

src/kendo.pager.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var __meta__ = { // jshint ignore:line
1919
LAST = ".k-i-arrow-end-right",
2020
PREV = ".k-i-arrow-60-left",
2121
NEXT = ".k-i-arrow-60-right",
22+
SIZE = "k-pager-lg k-pager-md k-pager-sm",
2223
CHANGE = "change",
2324
NS = ".kendoPager",
2425
CLICK = "click",
@@ -74,6 +75,7 @@ var __meta__ = { // jshint ignore:line
7475
var Pager = Widget.extend( {
7576
init: function(element, options) {
7677
var that = this, page, totalPages;
78+
var sizeClassName = null;
7779

7880
Widget.fn.init.call(that, element, options);
7981

@@ -189,6 +191,14 @@ var __meta__ = { // jshint ignore:line
189191
that.refresh();
190192
}
191193

194+
that._resizeHandler = proxy(that.resize, that, true);
195+
$(window).on("resize" + NS, that._resizeHandler);
196+
197+
sizeClassName = that._getWidthSizeClass(that.element.width());
198+
if (sizeClassName) {
199+
that.element.addClass(sizeClassName);
200+
}
201+
192202
kendo.notify(that);
193203
},
194204

@@ -200,6 +210,7 @@ var __meta__ = { // jshint ignore:line
200210
that.element.off(NS);
201211
that.dataSource.unbind(CHANGE, that._refreshHandler);
202212
that._refreshHandler = null;
213+
$(window).off("resize" + NS, this._resizeHandler);
203214

204215
kendo.destroy(that.element);
205216
that.element = that.list = null;
@@ -250,6 +261,20 @@ var __meta__ = { // jshint ignore:line
250261
}
251262
},
252263

264+
_resize: function(size) {
265+
if (size.width) {
266+
var sizeClassName = this._getWidthSizeClass(size.width);
267+
var el = this.element;
268+
269+
if (!sizeClassName) {
270+
el.removeClass(SIZE);
271+
} else if (!el.hasClass(sizeClassName)) {
272+
el.removeClass(SIZE);
273+
el.addClass(sizeClassName);
274+
}
275+
}
276+
},
277+
253278
_createDataSource: function(options) {
254279
this.dataSource = kendo.data.DataSource.create(options.dataSource);
255280
},
@@ -454,6 +479,19 @@ var __meta__ = { // jshint ignore:line
454479
return 0;
455480
}
456481
}
482+
},
483+
484+
_getWidthSizeClass: function(width) {
485+
var sizes = SIZE.split(" ");
486+
487+
if (width <= 480) {
488+
return sizes[2];
489+
} else if (width <= 640) {
490+
return sizes[1];
491+
} else if (width <= 1024) {
492+
return sizes[0];
493+
}
494+
return null;
457495
}
458496
});
459497

styles/web/common/grid.less

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,13 +449,19 @@ form.k-filter-menu .k-textbox
449449
margin: .5em 0 .5em;
450450
}
451451

452-
.k-filter-menu .k-button
452+
.k-filter-menu .k-action-buttons {
453+
margin: 0;
454+
padding: 0;
455+
text-align: initial;
456+
}
457+
458+
.k-filter-menu .k-action-buttons .k-button
453459
{
454460
width:48%;
455461
margin: .5em 4% 0 0;
456462
}
457463

458-
.k-filter-menu .k-button+.k-button
464+
.k-filter-menu .k-action-buttons .k-button+.k-button
459465
{
460466
margin-right: 0;
461467
}

styles/web/common/inputs.less

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ span.k-dropdowntree,
4343
cursor: pointer;
4444
}
4545

46-
.k-autocomplete > .k-i-close,
46+
.k-autocomplete > .k-i-close {
47+
right: calc(@input-clear-icon-offset);
48+
}
49+
4750
.k-multiselect-wrap > .k-i-close {
48-
right: (@grid-size/4 + 2px);
51+
right: calc(@input-clear-icon-offset + 1px);
4952
}
5053

5154
.k-autocomplete > .k-i-close,
@@ -55,11 +58,12 @@ span.k-dropdowntree,
5558
}
5659

5760
.k-dropdown-wrap > .k-i-close {
58-
right: 2.4em;
61+
right: calc(@combobox-clear-icon-offset);
5962
}
6063

61-
.k-multiselect-wrap > .k-i-close {
62-
top: (@grid-size/2);
64+
.k-multiselect-wrap > .k-i-close,
65+
.k-dropdowntree > .k-multiselect-wrap > .k-i-close {
66+
top: calc(@multiselect-clear-icon-top-offset);
6367
}
6468

6569
.k-multiselect-wrap .k-readonly,
@@ -201,7 +205,7 @@ span.k-dropdowntree,
201205
.k-dropdown-wrap,
202206
.k-numeric-wrap,
203207
.k-picker-wrap {
204-
padding-right: calc(@input-height + .35em);
208+
padding-right: calc(@input-offset);
205209
}
206210

207211
.k-numeric-wrap.k-expand-padding {
@@ -603,7 +607,7 @@ body .k-datetimepicker .k-select {
603607
.k-multiselect-clearable .k-multiselect-wrap,
604608
.k-dropdowntree-clearable .k-multiselect-wrap,
605609
.k-dropdowntree-clearable .k-dropdown-wrap .k-input {
606-
padding-right: calc(@input-height + .35em);
610+
padding-right: calc(@input-offset);
607611
}
608612

609613
// Date/Time Pickers
@@ -923,12 +927,19 @@ span.k-numerictextbox {
923927
.k-dropdowntree-clearable .k-multiselect-wrap,
924928
.k-dropdowntree-clearable .k-dropdown-wrap .k-input {
925929
padding-right: 0;
926-
padding-left: calc(@input-height + .35em);
930+
padding-left: calc(@input-offset);
927931
}
928932

929933
.k-dropdown-wrap > .k-i-close {
930-
left: 2.4em;
931-
right: auto;
934+
left: calc(@combobox-clear-icon-offset);
935+
}
936+
937+
.k-autocomplete > .k-i-close {
938+
left: calc(@input-clear-icon-offset);
939+
}
940+
941+
.k-multiselect-wrap > .k-i-close {
942+
left: calc(@input-clear-icon-offset + 1px);
932943
}
933944

934945
.k-numeric-wrap.k-state-invalid.k-expand-padding .k-i-warning{

styles/web/kendo.common-bootstrap.less

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
@input-height: 1.93571428em;
22
@input-padding-y: 0.17857143em;
33
@input-indent: .8em;
4+
@input-offset: (@input-height + .35em);
5+
6+
@combobox-padding-x: 1.9em;
7+
8+
@input-clear-icon-offset: ~"( (@{input-offset} - @{grid-size})/2 )";
9+
@combobox-clear-icon-offset: ~"( @{input-offset} + ((@{combobox-padding-x} - @{grid-size})/2) )";
10+
@multiselect-clear-icon-top-offset: ~"( (@{input-height} - @{grid-size}) / 2 + @{input-padding-y} + 1px )";
11+
412
@editor-icon-size: 32px;
513
@menu-link-padding: 1.2em 1.2em 1.1em;
614
@button-padding-x: 14px;
@@ -160,14 +168,10 @@ input.k-textbox {
160168

161169
.k-combobox-clearable {
162170
.k-input {
163-
padding-right: 1.9em;
171+
padding-right: @combobox-padding-x;
164172
}
165173
}
166174

167-
.k-autocomplete > .k-i-close {
168-
margin-right: 8px;
169-
}
170-
171175
.k-colorpicker {
172176
@picker-icon-height: 2.28571428em;
173177
.k-selected-color {
@@ -181,12 +185,7 @@ input.k-textbox {
181185
}
182186

183187
.k-combobox > .k-dropdown-wrap > .k-i-close {
184-
right: 2.55em;
185-
}
186-
187-
.k-multiselect > .k-multiselect-wrap > .k-i-close,
188-
.k-dropdowntree > .k-multiselect-wrap > .k-i-close {
189-
top: calc((@input-height - @grid-size) / 2 + @input-padding-y + 1px);
188+
right: calc(@combobox-clear-icon-offset);
190189
}
191190

192191
.k-numerictextbox .k-link {
@@ -209,14 +208,12 @@ input.k-textbox {
209208

210209
.k-rtl .k-widget.k-autocomplete > .k-i-close,
211210
.k-rtl .k-widget.k-multiselect > .k-multiselect-wrap > .k-i-close {
212-
left: 0;
213211
right: initial;
214-
margin-left: 8px;
215212
margin-right: 0;
216213
}
217214

218215
.k-rtl .k-widget.k-combobox > .k-dropdown-wrap > .k-i-close {
219-
left: 2.55em;
216+
left: calc(@combobox-clear-icon-offset);
220217
right: initial;
221218
}
222219

@@ -320,7 +317,7 @@ input.k-textbox {
320317

321318
.k-combobox-clearable {
322319
.k-input {
323-
padding-left: 1.9em;
320+
padding-left: @combobox-padding-x;
324321
padding-right: 0.167em;
325322
}
326323
}

styles/web/kendo.common-fiori.less

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
@input-height: 1.65em;
22
@input-padding-y: 0.532142857em;
33
@input-indent: .8em;
4+
@input-offset: (@input-height + .35em);
5+
6+
@combobox-padding-x: 2.71428571em;
7+
8+
@input-clear-icon-offset: ~"((@{input-offset} - @{grid-size})/2)";
9+
@combobox-clear-icon-offset: ~"( @{combobox-padding-x} + ((@{combobox-padding-x} - @{grid-size})/2) )";
10+
@multiselect-clear-icon-top-offset: ~"( (@{input-height} - @{grid-size}) / 2 + @{input-padding-y} + 1px )";
11+
412
@editor-icon-size: 36px;
513
@menu-link-padding: 1.071em;
614
@button-padding-x: 14px;
@@ -360,7 +368,7 @@ input.k-textbox,
360368
}
361369

362370
.k-combobox-clearable .k-input {
363-
padding-right: 2.71428571em;
371+
padding-right: @combobox-padding-x;
364372
width: calc(100% - 2.71428571em);
365373
}
366374

@@ -414,17 +422,7 @@ input.k-textbox,
414422
}
415423

416424
.k-combobox > .k-dropdown-wrap > .k-i-close {
417-
right: 3.4em;
418-
}
419-
420-
.k-multiselect > .k-multiselect-wrap > .k-i-close,
421-
.k-dropdowntree > .k-multiselect-wrap > .k-i-close {
422-
top: calc((@input-height - @grid-size) / 2 + @input-padding-y + 1px);
423-
}
424-
425-
.k-autocomplete > .k-i-close,
426-
.k-multiselect > .k-multiselect-wrap > .k-i-close {
427-
margin-right: 10px;
425+
right: calc(@combobox-clear-icon-offset);
428426
}
429427

430428
.k-multiselect-wrap li {
@@ -893,14 +891,12 @@ span.k-tooltip
893891

894892
.k-rtl .k-widget.k-autocomplete > .k-i-close,
895893
.k-rtl .k-widget.k-multiselect > .k-multiselect-wrap > .k-i-close {
896-
left: 0;
897894
right: initial;
898-
margin-left: 10px;
899895
margin-right: 0;
900896
}
901897

902898
.k-rtl .k-widget.k-combobox > .k-dropdown-wrap > .k-i-close {
903-
left: 3.4em;
899+
left: calc(@combobox-clear-icon-offset);
904900
right: initial;
905901
}
906902

@@ -1053,7 +1049,7 @@ div.k-spreadsheet-window {
10531049
// RTL
10541050
.k-rtl {
10551051
span.k-combobox-clearable .k-input {
1056-
padding-left: 2.71428571em;
1052+
padding-left: @combobox-padding-x;
10571053
padding-right: 0;
10581054
}
10591055

styles/web/kendo.common-material.less

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
@input-height: 2.07142857em;
22
@input-padding-y: 0.17857143em;
33
@input-indent: .8em;
4+
@input-offset: (@input-height + .35em);
5+
6+
@combobox-padding-x: 2.5em;
7+
8+
@input-clear-icon-offset: ~"( (@{input-offset} - @{grid-size})/2 )";
9+
@combobox-clear-icon-offset: ~"( @{input-offset} + ((@{combobox-padding-x} - @{grid-size})/2) )";
10+
@multiselect-clear-icon-top-offset: ~"( (@{input-height} - @{grid-size}) / 2 + @{input-padding-y} + 1px )";
11+
412
@editor-icon-size: 36px;
513
@menu-link-padding: 1.071em;
614
@button-padding-x: 14px;
@@ -210,7 +218,7 @@
210218
padding: .5em .5em 0;
211219
}
212220

213-
.k-filter-menu .k-button {
221+
.k-filter-menu .k-action-buttons .k-button {
214222
margin: 0;
215223
width: 50%;
216224
border-radius: 0;
@@ -338,35 +346,21 @@
338346
}
339347

340348
.k-combobox > .k-dropdown-wrap > .k-i-close {
341-
right: 3.3em;
349+
right: calc(@combobox-clear-icon-offset);
342350
}
343351

344352
.k-combobox-clearable {
345353
.k-input {
346-
padding-right: 2.5em;
354+
padding-right: @combobox-padding-x;
347355
}
348356
}
349357

350-
.k-multiselect > .k-multiselect-wrap > .k-i-close {
351-
top: (@grid-size/2 - 1px);
352-
}
353-
354358
.k-autocomplete .k-i-loading,
355359
.k-multiselect .k-i-loading
356360
{
357361
bottom: 10px;
358362
}
359363

360-
.k-multiselect > .k-multiselect-wrap > .k-i-close,
361-
.k-dropdowntree > .k-multiselect-wrap > .k-i-close {
362-
top: calc((@input-height - @grid-size) / 2 + @input-padding-y + 1px);
363-
}
364-
365-
.k-autocomplete > .k-i-close,
366-
.k-multiselect > .k-multiselect-wrap > .k-i-close {
367-
right: 10px;
368-
}
369-
370364
.k-dropdown-wrap,
371365
.k-picker-wrap,
372366
.k-numeric-wrap {
@@ -1006,14 +1000,12 @@ form.k-filter-menu .k-textbox {
10061000

10071001
.k-rtl .k-widget.k-autocomplete > .k-i-close,
10081002
.k-rtl .k-widget.k-multiselect > .k-multiselect-wrap > .k-i-close {
1009-
left: 0;
10101003
right: initial;
1011-
margin-left: 10px;
10121004
margin-right: 0;
10131005
}
10141006

10151007
.k-rtl .k-widget.k-combobox > .k-dropdown-wrap > .k-i-close {
1016-
left: 3.3em;
1008+
left: calc(@combobox-clear-icon-offset);
10171009
right: initial;
10181010
}
10191011

@@ -1159,7 +1151,7 @@ div.k-spreadsheet-window {
11591151
.k-combobox-clearable {
11601152

11611153
.k-input {
1162-
padding-left: 2.5em;
1154+
padding-left: @combobox-padding-x;
11631155
}
11641156
}
11651157

0 commit comments

Comments
 (0)