Skip to content

Commit e80895d

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 9c7b00d commit e80895d

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

src/kendo.calendar.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,8 @@ var __meta__ = {
992992
active = that._active,
993993
horizontal = that.options.animation.horizontal,
994994
effects = horizontal.effects,
995-
viewWidth = outerWidth(from);
995+
viewWidth = outerWidth(from),
996+
margin = (outerWidth(from, true) - viewWidth);
996997

997998
if (effects && effects.indexOf(SLIDE) != -1) {
998999
from.add(to).css({ width: viewWidth });
@@ -1004,9 +1005,9 @@ var __meta__ = {
10041005
from.parent()
10051006
.css({
10061007
position: "relative",
1007-
width: viewWidth * 2,
1008-
"float": LEFT,
1009-
"margin-left": future ? 0 : -viewWidth
1008+
width: (viewWidth * 2) + (2 * margin),
1009+
display: "flex",
1010+
"margin-left": future ? 0 : (-viewWidth - margin)
10101011
});
10111012

10121013
to[future ? "insertAfter" : "insertBefore"](from);

src/kendo.data.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,6 +1971,7 @@ var __meta__ = {
19711971

19721972
if (skip + take > total && options.virtual) {
19731973
skip -= skip + take - total;
1974+
skip = skip < 0 ? 0 : skip;
19741975
}
19751976
query = query.range(skip, take);
19761977
}

styles/web/Default/popover/_layout.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
1717
}
1818

19+
.k-popover-inner {
20+
position: relative;
21+
border-radius: inherit;
22+
}
23+
1924
// Header
2025
.k-popover-header {
2126
border-top-left-radius: @popover-border-radius;

styles/web/Default/popover/_theme.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
);
1010
}
1111

12+
.k-popover-inner {
13+
background-color: inherit;
14+
border-color: inherit;
15+
}
16+
1217
// Header
1318
.k-popover-header {
1419
.fill(

0 commit comments

Comments
 (0)