Skip to content

Commit 1fa7d62

Browse files
committed
3.0.0-beta.17 release
1 parent 61fd873 commit 1fa7d62

36 files changed

+405
-581
lines changed

CHANGELOG.md

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

33
# Change Log
44

5+
# [v3.0.0-beta.17](https://github.com/framework7io/framework7/compare/v3.0.0-beta.16...v3.0.0-beta.17) - July 2, 2018
6+
* Core
7+
* Router
8+
* `preRoute` middleware renamed to `beforeEnter` that will be executed before route load/enter.
9+
* Added `beforeLeave` route middleware that will be executed before route unload/leave.
10+
* Progressbar
11+
* Fixed positioning of progressbar inside of the Page with statusbar enabled
12+
513
# [v3.0.0-beta.16](https://github.com/framework7io/framework7/compare/v3.0.0-beta.15...v3.0.0-beta.16) - July 1, 2018
614
* Core
715
* Searchbar - fixed issue with wrong `previousQuery` in `search` event

packages/core/components/progressbar/progressbar.less

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,27 @@ body, .view, .views, .page, .panel, .popup, .framework7-root {
1515
border-radius: 0 !important;
1616
transform-origin: center top !important;
1717
}
18-
html.with-statusbar.device-ios &, html.with-statusbar.ios:not(.device-ios):not(.device-android) & {
18+
}
19+
.with-statusbar.device-ios,
20+
.with-statusbar.ios:not(.device-ios):not(.device-android) {
21+
body, .framework7-root {
1922
> .progressbar, > .progressbar-infinite {
2023
top: 20px;
2124
}
2225
}
23-
html.with-statusbar.device-android &, html.with-statusbar.md:not(.device-ios):not(.device-android) & {
26+
}
27+
.with-statusbar.device-android,
28+
.with-statusbar.md:not(.device-ios):not(.device-android) {
29+
body, .framework7-root {
2430
> .progressbar, > .progressbar-infinite {
2531
top: 24px;
2632
}
2733
}
2834
}
35+
2936
.with-statusbar {
3037
.safe-areas({
31-
body, .view, .views, .page, .panel, .popup, .framework7-root {
38+
body, .framework7-root {
3239
> .progressbar, > .progressbar-infinite {
3340
top: constant(safe-area-inset-top);
3441
top: env(safe-area-inset-top);

packages/core/css/framework7.css

Lines changed: 18 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/**
2-
* Framework7 3.0.0-beta.16
2+
* Framework7 3.0.0-beta.17
33
* Full featured mobile HTML framework for building iOS & Android apps
44
* http://framework7.io/
55
*
66
* Copyright 2014-2018 Vladimir Kharlampidi
77
*
88
* Released under the MIT License
99
*
10-
* Released on: July 1, 2018
10+
* Released on: July 2, 2018
1111
*/
1212
html,
1313
body,
@@ -9866,79 +9866,29 @@ body > .progressbar-infinite,
98669866
-webkit-transform-origin: center top !important;
98679867
transform-origin: center top !important;
98689868
}
9869-
html.with-statusbar.device-ios body > .progressbar,
9870-
html.with-statusbar.device-ios .view > .progressbar,
9871-
html.with-statusbar.device-ios .views > .progressbar,
9872-
html.with-statusbar.device-ios .page > .progressbar,
9873-
html.with-statusbar.device-ios .panel > .progressbar,
9874-
html.with-statusbar.device-ios .popup > .progressbar,
9875-
html.with-statusbar.device-ios .framework7-root > .progressbar,
9876-
html.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar,
9877-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .view > .progressbar,
9878-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .views > .progressbar,
9879-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .page > .progressbar,
9880-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .panel > .progressbar,
9881-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .popup > .progressbar,
9882-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
9883-
html.with-statusbar.device-ios body > .progressbar-infinite,
9884-
html.with-statusbar.device-ios .view > .progressbar-infinite,
9885-
html.with-statusbar.device-ios .views > .progressbar-infinite,
9886-
html.with-statusbar.device-ios .page > .progressbar-infinite,
9887-
html.with-statusbar.device-ios .panel > .progressbar-infinite,
9888-
html.with-statusbar.device-ios .popup > .progressbar-infinite,
9889-
html.with-statusbar.device-ios .framework7-root > .progressbar-infinite,
9890-
html.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar-infinite,
9891-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .view > .progressbar-infinite,
9892-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .views > .progressbar-infinite,
9893-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .page > .progressbar-infinite,
9894-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .panel > .progressbar-infinite,
9895-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .popup > .progressbar-infinite,
9896-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
9869+
.with-statusbar.device-ios body > .progressbar,
9870+
.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar,
9871+
.with-statusbar.device-ios .framework7-root > .progressbar,
9872+
.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
9873+
.with-statusbar.device-ios body > .progressbar-infinite,
9874+
.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar-infinite,
9875+
.with-statusbar.device-ios .framework7-root > .progressbar-infinite,
9876+
.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
98979877
top: 20px;
98989878
}
9899-
html.with-statusbar.device-android body > .progressbar,
9900-
html.with-statusbar.device-android .view > .progressbar,
9901-
html.with-statusbar.device-android .views > .progressbar,
9902-
html.with-statusbar.device-android .page > .progressbar,
9903-
html.with-statusbar.device-android .panel > .progressbar,
9904-
html.with-statusbar.device-android .popup > .progressbar,
9905-
html.with-statusbar.device-android .framework7-root > .progressbar,
9906-
html.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar,
9907-
html.with-statusbar.md:not(.device-ios):not(.device-android) .view > .progressbar,
9908-
html.with-statusbar.md:not(.device-ios):not(.device-android) .views > .progressbar,
9909-
html.with-statusbar.md:not(.device-ios):not(.device-android) .page > .progressbar,
9910-
html.with-statusbar.md:not(.device-ios):not(.device-android) .panel > .progressbar,
9911-
html.with-statusbar.md:not(.device-ios):not(.device-android) .popup > .progressbar,
9912-
html.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
9913-
html.with-statusbar.device-android body > .progressbar-infinite,
9914-
html.with-statusbar.device-android .view > .progressbar-infinite,
9915-
html.with-statusbar.device-android .views > .progressbar-infinite,
9916-
html.with-statusbar.device-android .page > .progressbar-infinite,
9917-
html.with-statusbar.device-android .panel > .progressbar-infinite,
9918-
html.with-statusbar.device-android .popup > .progressbar-infinite,
9919-
html.with-statusbar.device-android .framework7-root > .progressbar-infinite,
9920-
html.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar-infinite,
9921-
html.with-statusbar.md:not(.device-ios):not(.device-android) .view > .progressbar-infinite,
9922-
html.with-statusbar.md:not(.device-ios):not(.device-android) .views > .progressbar-infinite,
9923-
html.with-statusbar.md:not(.device-ios):not(.device-android) .page > .progressbar-infinite,
9924-
html.with-statusbar.md:not(.device-ios):not(.device-android) .panel > .progressbar-infinite,
9925-
html.with-statusbar.md:not(.device-ios):not(.device-android) .popup > .progressbar-infinite,
9926-
html.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
9879+
.with-statusbar.device-android body > .progressbar,
9880+
.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar,
9881+
.with-statusbar.device-android .framework7-root > .progressbar,
9882+
.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
9883+
.with-statusbar.device-android body > .progressbar-infinite,
9884+
.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar-infinite,
9885+
.with-statusbar.device-android .framework7-root > .progressbar-infinite,
9886+
.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
99279887
top: 24px;
99289888
}
99299889
.with-statusbar.device-iphone-x body > .progressbar,
9930-
.with-statusbar.device-iphone-x .view > .progressbar,
9931-
.with-statusbar.device-iphone-x .views > .progressbar,
9932-
.with-statusbar.device-iphone-x .page > .progressbar,
9933-
.with-statusbar.device-iphone-x .panel > .progressbar,
9934-
.with-statusbar.device-iphone-x .popup > .progressbar,
99359890
.with-statusbar.device-iphone-x .framework7-root > .progressbar,
99369891
.with-statusbar.device-iphone-x body > .progressbar-infinite,
9937-
.with-statusbar.device-iphone-x .view > .progressbar-infinite,
9938-
.with-statusbar.device-iphone-x .views > .progressbar-infinite,
9939-
.with-statusbar.device-iphone-x .page > .progressbar-infinite,
9940-
.with-statusbar.device-iphone-x .panel > .progressbar-infinite,
9941-
.with-statusbar.device-iphone-x .popup > .progressbar-infinite,
99429892
.with-statusbar.device-iphone-x .framework7-root > .progressbar-infinite {
99439893
top: constant(safe-area-inset-top);
99449894
top: env(safe-area-inset-top);

packages/core/css/framework7.ios.css

Lines changed: 18 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
/**
2-
* Framework7 3.0.0-beta.16
2+
* Framework7 3.0.0-beta.17
33
* Full featured mobile HTML framework for building iOS & Android apps
44
* http://framework7.io/
55
*
66
* Copyright 2014-2018 Vladimir Kharlampidi
77
*
88
* Released under the MIT License
99
*
10-
* Released on: July 1, 2018
10+
* Released on: July 2, 2018
1111
*/
1212
html,
1313
body,
@@ -5882,79 +5882,29 @@ body > .progressbar-infinite,
58825882
-webkit-transform-origin: center top !important;
58835883
transform-origin: center top !important;
58845884
}
5885-
html.with-statusbar.device-ios body > .progressbar,
5886-
html.with-statusbar.device-ios .view > .progressbar,
5887-
html.with-statusbar.device-ios .views > .progressbar,
5888-
html.with-statusbar.device-ios .page > .progressbar,
5889-
html.with-statusbar.device-ios .panel > .progressbar,
5890-
html.with-statusbar.device-ios .popup > .progressbar,
5891-
html.with-statusbar.device-ios .framework7-root > .progressbar,
5892-
html.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar,
5893-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .view > .progressbar,
5894-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .views > .progressbar,
5895-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .page > .progressbar,
5896-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .panel > .progressbar,
5897-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .popup > .progressbar,
5898-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
5899-
html.with-statusbar.device-ios body > .progressbar-infinite,
5900-
html.with-statusbar.device-ios .view > .progressbar-infinite,
5901-
html.with-statusbar.device-ios .views > .progressbar-infinite,
5902-
html.with-statusbar.device-ios .page > .progressbar-infinite,
5903-
html.with-statusbar.device-ios .panel > .progressbar-infinite,
5904-
html.with-statusbar.device-ios .popup > .progressbar-infinite,
5905-
html.with-statusbar.device-ios .framework7-root > .progressbar-infinite,
5906-
html.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar-infinite,
5907-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .view > .progressbar-infinite,
5908-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .views > .progressbar-infinite,
5909-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .page > .progressbar-infinite,
5910-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .panel > .progressbar-infinite,
5911-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .popup > .progressbar-infinite,
5912-
html.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
5885+
.with-statusbar.device-ios body > .progressbar,
5886+
.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar,
5887+
.with-statusbar.device-ios .framework7-root > .progressbar,
5888+
.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
5889+
.with-statusbar.device-ios body > .progressbar-infinite,
5890+
.with-statusbar.ios:not(.device-ios):not(.device-android) body > .progressbar-infinite,
5891+
.with-statusbar.device-ios .framework7-root > .progressbar-infinite,
5892+
.with-statusbar.ios:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
59135893
top: 20px;
59145894
}
5915-
html.with-statusbar.device-android body > .progressbar,
5916-
html.with-statusbar.device-android .view > .progressbar,
5917-
html.with-statusbar.device-android .views > .progressbar,
5918-
html.with-statusbar.device-android .page > .progressbar,
5919-
html.with-statusbar.device-android .panel > .progressbar,
5920-
html.with-statusbar.device-android .popup > .progressbar,
5921-
html.with-statusbar.device-android .framework7-root > .progressbar,
5922-
html.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar,
5923-
html.with-statusbar.md:not(.device-ios):not(.device-android) .view > .progressbar,
5924-
html.with-statusbar.md:not(.device-ios):not(.device-android) .views > .progressbar,
5925-
html.with-statusbar.md:not(.device-ios):not(.device-android) .page > .progressbar,
5926-
html.with-statusbar.md:not(.device-ios):not(.device-android) .panel > .progressbar,
5927-
html.with-statusbar.md:not(.device-ios):not(.device-android) .popup > .progressbar,
5928-
html.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
5929-
html.with-statusbar.device-android body > .progressbar-infinite,
5930-
html.with-statusbar.device-android .view > .progressbar-infinite,
5931-
html.with-statusbar.device-android .views > .progressbar-infinite,
5932-
html.with-statusbar.device-android .page > .progressbar-infinite,
5933-
html.with-statusbar.device-android .panel > .progressbar-infinite,
5934-
html.with-statusbar.device-android .popup > .progressbar-infinite,
5935-
html.with-statusbar.device-android .framework7-root > .progressbar-infinite,
5936-
html.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar-infinite,
5937-
html.with-statusbar.md:not(.device-ios):not(.device-android) .view > .progressbar-infinite,
5938-
html.with-statusbar.md:not(.device-ios):not(.device-android) .views > .progressbar-infinite,
5939-
html.with-statusbar.md:not(.device-ios):not(.device-android) .page > .progressbar-infinite,
5940-
html.with-statusbar.md:not(.device-ios):not(.device-android) .panel > .progressbar-infinite,
5941-
html.with-statusbar.md:not(.device-ios):not(.device-android) .popup > .progressbar-infinite,
5942-
html.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
5895+
.with-statusbar.device-android body > .progressbar,
5896+
.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar,
5897+
.with-statusbar.device-android .framework7-root > .progressbar,
5898+
.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar,
5899+
.with-statusbar.device-android body > .progressbar-infinite,
5900+
.with-statusbar.md:not(.device-ios):not(.device-android) body > .progressbar-infinite,
5901+
.with-statusbar.device-android .framework7-root > .progressbar-infinite,
5902+
.with-statusbar.md:not(.device-ios):not(.device-android) .framework7-root > .progressbar-infinite {
59435903
top: 24px;
59445904
}
59455905
.with-statusbar.device-iphone-x body > .progressbar,
5946-
.with-statusbar.device-iphone-x .view > .progressbar,
5947-
.with-statusbar.device-iphone-x .views > .progressbar,
5948-
.with-statusbar.device-iphone-x .page > .progressbar,
5949-
.with-statusbar.device-iphone-x .panel > .progressbar,
5950-
.with-statusbar.device-iphone-x .popup > .progressbar,
59515906
.with-statusbar.device-iphone-x .framework7-root > .progressbar,
59525907
.with-statusbar.device-iphone-x body > .progressbar-infinite,
5953-
.with-statusbar.device-iphone-x .view > .progressbar-infinite,
5954-
.with-statusbar.device-iphone-x .views > .progressbar-infinite,
5955-
.with-statusbar.device-iphone-x .page > .progressbar-infinite,
5956-
.with-statusbar.device-iphone-x .panel > .progressbar-infinite,
5957-
.with-statusbar.device-iphone-x .popup > .progressbar-infinite,
59585908
.with-statusbar.device-iphone-x .framework7-root > .progressbar-infinite {
59595909
top: constant(safe-area-inset-top);
59605910
top: env(safe-area-inset-top);

packages/core/css/framework7.ios.min.css

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)