Skip to content

Commit 5bae578

Browse files
nolimits4webnolimits4web
committed
3.0.0-beta.18 release
1 parent f3c9d89 commit 5bae578

Some content is hidden

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

45 files changed

+262
-219
lines changed

‎CHANGELOG.md

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

33
# Change Log
44

5+
# [v3.0.0-beta.18](https://github.com/framework7io/framework7/compare/v3.0.0-beta.17...v3.0.0-beta.18) - July 3, 2018
6+
* Core
7+
* Router
8+
* Fixed error with `beforeLeave` middleware when loading initial route
9+
510
# [v3.0.0-beta.17](https://github.com/framework7io/framework7/compare/v3.0.0-beta.16...v3.0.0-beta.17) - July 2, 2018
611
* Core
712
* Router

‎kitchen-sink/react/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name="theme-color" content="#2196f3">
99
<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap:">
1010
<title>Framework7</title>
11-
<link rel="stylesheet" href="../../packages/core/css/framework7.min.css">
11+
<link rel="stylesheet" href="../../build/core/css/framework7.css">
1212
<link rel="stylesheet" href="css/app.css">
1313
</head>
1414
<body>

‎packages/core/components/app/app-ios.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
color: @themeColor;
1313
}
1414
// Fix for iPad in Safari in Lanscape mode
15-
@media all and (width:1024px) and (height:691px) and (orientation:landscape) {
15+
@media (width:1024px) and (height:691px) and (orientation:landscape) {
1616
&, & body, & .framework7-root {
1717
height: 671px;
1818
}
1919
}
20-
@media all and (width:1024px) and (height:692px) and (orientation:landscape) {
20+
@media (width:1024px) and (height:692px) and (orientation:landscape) {
2121
&, & body, & .framework7-root {
2222
height: 672px;
2323
}

‎packages/core/components/app/app.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ a, button, input, textarea, .link, .button, label, .sortable-handler {
3636
}
3737
*/
3838
// Fix for iPad in Safari in Lanscape mode
39-
@media all and (width:1024px) and (height:691px) and (orientation:landscape) {
39+
@media (width:1024px) and (height:691px) and (orientation:landscape) {
4040
html, body, .framework7-root {
4141
height: 671px;
4242
}
4343
}
44-
@media all and (width:1024px) and (height:692px) and (orientation:landscape) {
44+
@media (width:1024px) and (height:692px) and (orientation:landscape) {
4545
html, body, .framework7-root {
4646
height: 672px;
4747
}

‎packages/core/components/block/block-ios.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
margin-top: -25px;
6666
margin-bottom: 35px;
6767
}
68-
@media all and (min-width:768px) {
68+
@media (min-width:768px) {
6969
.block.tablet-inset {
7070
margin-left: 15px;
7171
margin-right: 15px;
@@ -110,7 +110,7 @@
110110
margin-left: ~"calc(15px + constant(safe-area-inset-left))";
111111
margin-left: ~"calc(15px + env(safe-area-inset-left))";
112112
}
113-
@media all and (min-width:768px) {
113+
@media (min-width:768px) {
114114
.block.tablet-inset:not(.no-ios-edges):not(.no-ios-left-edge) {
115115
margin-left: ~"calc(15px + constant(safe-area-inset-left))";
116116
margin-left: ~"calc(15px + env(safe-area-inset-left))";
@@ -134,7 +134,7 @@
134134
margin-right: ~"calc(15px + constant(safe-area-inset-right))";
135135
margin-right: ~"calc(15px + env(safe-area-inset-right))";
136136
}
137-
@media all and (min-width:768px) {
137+
@media (min-width:768px) {
138138
.block.tablet-inset:not(.no-ios-edges):not(.no-ios-right-edge) {
139139
margin-right: ~"calc(15px + constant(safe-area-inset-right))";
140140
margin-right: ~"calc(15px + env(safe-area-inset-right))";

‎packages/core/components/block/block-md.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
margin-top: -22px;
6262
margin-bottom: 32px;
6363
}
64-
@media all and (min-width:768px) {
64+
@media (min-width:768px) {
6565
.block.tablet-inset {
6666
margin-left: 16px;
6767
margin-right: 16px;
@@ -100,7 +100,7 @@
100100
margin-left: ~"calc(16px + constant(safe-area-inset-left))";
101101
margin-left: ~"calc(16px + env(safe-area-inset-left))";
102102
}
103-
@media all and (min-width:768px) {
103+
@media (min-width:768px) {
104104
.block.tablet-inset:not(.no-ios-edges):not(.no-ios-left-edge) {
105105
margin-left: ~"calc(16px + constant(safe-area-inset-left))";
106106
margin-left: ~"calc(16px + env(safe-area-inset-left))";
@@ -124,7 +124,7 @@
124124
margin-right: ~"calc(16px + constant(safe-area-inset-right))";
125125
margin-right: ~"calc(16px + env(safe-area-inset-right))";
126126
}
127-
@media all and (min-width:768px) {
127+
@media (min-width:768px) {
128128
.block.tablet-inset:not(.no-ios-edges):not(.no-ios-right-edge) {
129129
margin-right: ~"calc(16px + constant(safe-area-inset-right))";
130130
margin-right: ~"calc(16px + env(safe-area-inset-right))";

‎packages/core/components/block/block.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
margin-top: 10px;
5050
}
5151

52-
@media all and (min-width:768px) {
52+
@media (min-width:768px) {
5353
.block-strong.tablet-inset {
5454
.hairline-remove(top);
5555
.hairline-remove(bottom);

‎packages/core/components/calendar/calendar.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
height: 100% / 6;
9191
height: ~"calc(100% / 6)";
9292
display: flex;
93-
flex-shink: 1;
93+
flex-shrink: 1;
9494
width: 100%;
9595
position: relative;
9696
box-sizing: border-box;
9797
}
9898
.calendar-day {
99-
flex-shink: 1;
99+
flex-shrink: 1;
100100
display: flex;
101101
justify-content: center;
102102
align-items: center;
@@ -159,7 +159,7 @@
159159
align-items: center;
160160
width: 50%;
161161
max-width: 200px;
162-
flex-shink: 10;
162+
flex-shrink: 10;
163163
span {
164164
flex-shrink: 1;
165165
position: relative;

‎packages/core/components/grid/grid-ios.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
.--;
3939
}
4040

41-
@media all and (min-width:768px) {
41+
@media (min-width:768px) {
4242
.row {
4343
.-(@i: length(@cols)) when (@i > 0) {
4444
@divider: e(extract(@cols, @i));
@@ -75,7 +75,7 @@
7575
.--;
7676
}
7777
}
78-
@media all and (min-width:1025px) {
78+
@media (min-width:1025px) {
7979
.row {
8080
.-(@i: length(@cols)) when (@i > 0) {
8181
@divider: e(extract(@cols, @i));

‎packages/core/components/grid/grid-md.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
.--;
3939
}
4040

41-
@media all and (min-width:768px) {
41+
@media (min-width:768px) {
4242
.row {
4343
.-(@i: length(@cols)) when (@i > 0) {
4444
@divider: e(extract(@cols, @i));
@@ -76,7 +76,7 @@
7676
.--;
7777
}
7878
}
79-
@media all and (min-width:1025px) {
79+
@media (min-width:1025px) {
8080
.row {
8181
.-(@i: length(@cols)) when (@i > 0) {
8282
@divider: e(extract(@cols, @i));

0 commit comments

Comments
 (0)