Skip to content

Commit ceafca0

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent a5d5fd3 commit ceafca0

File tree

7 files changed

+20
-37
lines changed

7 files changed

+20
-37
lines changed

src/kendo.list.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,23 +2556,6 @@ var __meta__ = {
25562556
return candidate;
25572557
},
25582558

2559-
_template: function() {
2560-
var that = this;
2561-
var options = that.options;
2562-
var template = options.template;
2563-
2564-
if (!template) {
2565-
template = kendo.template('<li tabindex="-1" role="option" unselectable="on" class="k-list-item"><span class="k-list-item-text">${' + kendo.expr(options.dataTextField, "data") + "}</span></li>", { useWithBlock: false });
2566-
} else {
2567-
template = kendo.template(template);
2568-
template = function(data) {
2569-
return '<li tabindex="-1" role="option" unselectable="on" class="k-list-item">' + template(data) + "</li>";
2570-
};
2571-
}
2572-
2573-
return template;
2574-
},
2575-
25762559
_templates: function() {
25772560
var template;
25782561
var options = this.options;

styles/web/Default/action-sheet/_layout.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
// Actionsheet item
5555
.k-actionsheet-item {
5656
padding: 0;
57+
outline: 0;
58+
display: block;
5759
box-sizing: border-box;
5860
}
5961
.k-actionsheet-action {

styles/web/Default/action-sheet/_theme.less

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,20 @@
2727

2828

2929
// Actionsheet item
30-
.k-actionsheet-item {}
30+
.k-actionsheet-item {
31+
// Focus state
32+
&:focus,
33+
&.k-state-focus,
34+
&.k-focus {
35+
.fill(
36+
@actionsheet-item-focus-text,
37+
@actionsheet-item-focus-bg,
38+
@actionsheet-item-focus-border,
39+
@actionsheet-item-focus-gradient
40+
);
41+
.box-shadow( @actionsheet-item-focus-shadow );
42+
}
43+
}
3144

3245

3346
// Actionsheet action
@@ -47,21 +60,6 @@
4760
.box-shadow( @actionsheet-item-hover-shadow );
4861
}
4962

50-
51-
// Focus state
52-
&:focus,
53-
&.k-state-focus,
54-
&.k-focus {
55-
.fill(
56-
@actionsheet-item-focus-text,
57-
@actionsheet-item-focus-bg,
58-
@actionsheet-item-focus-border,
59-
@actionsheet-item-focus-gradient
60-
);
61-
.box-shadow( @actionsheet-item-focus-shadow );
62-
}
63-
64-
6563
// Disabed state
6664
&:disabled,
6765
&.k-state-disabled,

styles/web/type-bootstrap.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@
11281128
@actionsheet-item-focus-text: null;
11291129
@actionsheet-item-focus-border: null;
11301130
@actionsheet-item-focus-gradient: null;
1131-
@actionsheet-item-focus-shadow: @focused-shadow;
1131+
@actionsheet-item-focus-shadow: inset @focused-shadow;
11321132

11331133
@actionsheet-item-disabled-bg: null;
11341134
@actionsheet-item-disabled-text: null;

styles/web/type-default.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@
11081108
@actionsheet-item-focus-text: null;
11091109
@actionsheet-item-focus-border: null;
11101110
@actionsheet-item-focus-gradient: null;
1111-
@actionsheet-item-focus-shadow: @focused-shadow;
1111+
@actionsheet-item-focus-shadow: inset @focused-shadow;
11121112

11131113
@actionsheet-item-disabled-bg: null;
11141114
@actionsheet-item-disabled-text: null;

styles/web/type-highcontrast.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@
11131113
@actionsheet-item-focus-text: null;
11141114
@actionsheet-item-focus-border: null;
11151115
@actionsheet-item-focus-gradient: null;
1116-
@actionsheet-item-focus-shadow: @focused-shadow;
1116+
@actionsheet-item-focus-shadow: inset @focused-shadow;
11171117

11181118
@actionsheet-item-disabled-bg: null;
11191119
@actionsheet-item-disabled-text: null;

styles/web/type-material.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@
11371137
@actionsheet-item-focus-text: null;
11381138
@actionsheet-item-focus-border: null;
11391139
@actionsheet-item-focus-gradient: null;
1140-
@actionsheet-item-focus-shadow: @focused-shadow;
1140+
@actionsheet-item-focus-shadow: inset @focused-shadow;
11411141

11421142
@actionsheet-item-disabled-bg: null;
11431143
@actionsheet-item-disabled-text: null;

0 commit comments

Comments
 (0)