Skip to content

Commit 48c1ffd

Browse files
committed
fix(toolbar): place iOS border on ion-header/footer
1 parent 8be0a9f commit 48c1ffd

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

src/components/content/content.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ export class Content extends Ion {
488488
this._scrollEle.style.paddingBottom = (this._paddingBottom > 0 ? this._paddingBottom + 'px' : '');
489489
}
490490

491-
if (this._tabbarOnTop && this._tabs) {
491+
if (this._tabbarOnTop !== null && this._tabs) {
492492
if (this._tabbarOnTop) {
493493
this._tabs.setTabbarPosition(this._headerHeight, -1);
494494

src/components/searchbar/test/toolbar/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ion-header>
22

33
<ion-navbar>
4-
<ion-title>Test</ion-title>
4+
<ion-title>Searchbar Toolbars</ion-title>
55
</ion-navbar>
66

77
</ion-header>

src/components/toolbar/toolbar.ios.scss

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,44 @@ $navbar-ios-height: $toolbar-ios-height !default;
3737
}
3838

3939

40-
// iOS Toolbar Background
40+
// iOS Header Toolbar
4141
// --------------------------------------------------
4242

43-
.toolbar-background {
43+
ion-header {
44+
border: 0;
4445
border-bottom-width: 1px;
4546
border-style: solid;
4647
border-color: $toolbar-ios-border-color;
47-
background: $toolbar-ios-background;
4848
}
4949

50-
&.hairlines .toolbar-background {
50+
&.hairlines ion-header {
5151
border-bottom-width: $hairlines-width;
5252
}
5353

54-
.toolbar[position=bottom] .toolbar-background {
54+
55+
// iOS Footer Toolbar
56+
// --------------------------------------------------
57+
58+
ion-footer {
59+
border: 0;
5560
border-top-width: 1px;
56-
border-bottom-width: 0;
61+
border-style: solid;
62+
border-color: $toolbar-ios-border-color;
5763
}
5864

59-
&.hairlines .toolbar[position=bottom] .toolbar-background {
65+
&.hairlines ion-footer {
6066
border-top-width: $hairlines-width;
6167
}
6268

6369

70+
// iOS Toolbar Background
71+
// --------------------------------------------------
72+
73+
.toolbar-background {
74+
background: $toolbar-ios-background;
75+
}
76+
77+
6478
// iOS Toolbar Content
6579
// --------------------------------------------------
6680

0 commit comments

Comments
 (0)