Skip to content

Commit 5c511b4

Browse files
committed
4.0.0-beta.6 release
1 parent d61f4f1 commit 5c511b4

38 files changed

+283
-409
lines changed

packages/core/components/navbar/navbar-ios.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.ios {
22
.navbar {
33
a.icon-only {
4-
width: var(--f7-navbar-height);
4+
width: 44px;
55
margin: 0;
66
justify-content: center;
77
}

packages/core/components/navbar/navbar-md.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
a.icon-only {
99
min-width: 0;
1010
flex-shrink: 0;
11+
width: 56px;
1112
}
1213
.right {
1314
.ltr({

packages/core/components/navbar/navbar.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const Navbar = {
1313
});
1414
return;
1515
}
16+
1617
if (
1718
$el.hasClass('stacked')
1819
|| $el.parents('.stacked').length > 0
@@ -21,6 +22,14 @@ const Navbar = {
2122
) {
2223
return;
2324
}
25+
26+
if (app.theme === 'md' && app.params.navbar.mdCenterTitle) {
27+
$el.addClass('navbar-inner-centered-title');
28+
}
29+
if (app.theme === 'ios' && !app.params.navbar.iosCenterTitle) {
30+
$el.addClass('navbar-inner-left-title');
31+
}
32+
2433
const $viewEl = $el.parents('.view').eq(0);
2534
const left = app.rtl ? $el.children('.right') : $el.children('.left');
2635
const right = app.rtl ? $el.children('.left') : $el.children('.right');
@@ -131,12 +140,6 @@ const Navbar = {
131140
}
132141

133142
// Center title
134-
if (app.theme === 'md' && app.params.navbar.mdCenterTitle) {
135-
$el.addClass('navbar-inner-centered-title');
136-
}
137-
if (app.theme === 'ios' && !app.params.navbar.iosCenterTitle) {
138-
$el.addClass('navbar-inner-left-title');
139-
}
140143
if (
141144
(app.theme === 'ios' && app.params.navbar.iosCenterTitle)
142145
|| (app.theme === 'md' && app.params.navbar.mdCenterTitle)
@@ -152,7 +155,7 @@ const Navbar = {
152155
if (!$el.length) return;
153156
if ($el.hasClass('navbar-hidden')) return;
154157
let className = `navbar-hidden${animate ? ' navbar-transitioning' : ''}`;
155-
if ($el.find('.navbar-inner-current .title-large')) {
158+
if ($el.find('.navbar-current .title-large').length) {
156159
className += ' navbar-large-hidden';
157160
}
158161
$el.transitionEnd(() => {

packages/core/components/toast.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/components/toast.rtl.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/components/toast/toast.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
&.toast-center {
5252
top: 50%;
5353
}
54-
&.toat-top {
54+
&.toast-top {
5555
margin-top: var(--f7-statusbar-height);
5656
}
5757
}

0 commit comments

Comments
 (0)