Skip to content

Commit b341903

Browse files
committed
Navbar: fixes
1 parent 5da86c6 commit b341903

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

src/core/components/navbar/navbar.less

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,17 @@
205205
}
206206

207207
// Large Title Navbar
208+
.navbar-large .navbar-bg {
209+
height: calc(100% + var(--f7-navbar-large-title-height));
210+
transform: translate3d(0px, calc(-1 * var(--f7-navbar-large-collapse-progress) * var(--f7-navbar-large-title-height)), 0);
211+
}
212+
208213
.navbar-large-transparent .navbar-bg,
209214
.navbar-large.navbar-transparent .navbar-bg {
210215
opacity: var(--f7-navbar-large-collapse-progress);
211216
height: 100%;
212217
transform: none;
213218
}
214-
215-
.navbar-large .navbar-bg,
216219
.ios .router-navbar-transition-to-large .navbar-bg,
217220
.ios .router-navbar-transition-from-large .navbar-bg,
218221
.navbar-bg.ios-swipeback-navbar-bg-large,

src/phenome/components/navbar.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ export default {
9797
const slots = self.slots;
9898

9999
const isLarge = large || largeTransparent;
100-
const isLargeTransparent = isLarge && (largeTransparent || transparent);
101-
const isTransparent = !isLarge && transparent;
100+
const isTransparent = transparent || (isLarge && largeTransparent);
102101
const isTransparentVisible = isTransparent && transparentVisible;
103102

104103
const classes = Utils.classNames(
@@ -108,7 +107,6 @@ export default {
108107
{
109108
'navbar-hidden': hidden,
110109
'navbar-large': isLarge,
111-
'navbar-large-transparent': isLargeTransparent,
112110
'navbar-large-collapsed': isLarge && largeCollapsed,
113111
'navbar-transparent': isTransparent,
114112
'navbar-transparent-visible': isTransparentVisible,

src/svelte/components/navbar.svelte

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@
7979
|| (_theme && _theme.aurora && f7.instance && f7.instance.params.navbar.auroraCenterTitle);
8080
8181
$: isLarge = large || largeTransparent;
82-
$: isLargeTransparent = isLarge && (largeTransparent || transparent);
83-
$: isTransparent = !isLarge && transparent;
82+
$: isTransparent = transparent || (isLarge && largeTransparent);
8483
$: isTransparentVisible = isTransparent && transparentVisible;
8584
8685
$: classes = Utils.classNames(
@@ -90,7 +89,6 @@
9089
{
9190
'navbar-hidden': hidden,
9291
'navbar-large': isLarge,
93-
'navbar-large-transparent': isLargeTransparent,
9492
'navbar-large-collapsed': isLarge && largeCollapsed,
9593
'navbar-transparent': isTransparent,
9694
'navbar-transparent-visible': isTransparentVisible,

0 commit comments

Comments
 (0)