fix(ons-page): Change timing of status bar fill.

OnsenUI · Nov 27, 2015 · 40aefea · 40aefea
1 parent 1ce962c
commit 40aefea
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/core/css/common.css b/core/css/common.css
@@ -77,7 +77,7 @@ ons-toolbar + .page__background + .page__content {
   height: 64px;
 }
 
-.page__status-bar-fill + ons-toolbar[modifier="material"] {
+.page__status-bar-fill + ons-toolbar[modifier~="material"] {
   height: 76px;
 }
 
@@ -87,9 +87,9 @@ ons-toolbar + .page__background + .page__content {
   padding-top: 20px;
 }
 
-.page__status-bar-fill + ons-toolbar[modifier="material"] > .center,
-.page__status-bar-fill + ons-toolbar[modifier="material"] > .left,
-.page__status-bar-fill + ons-toolbar[modifier="material"] > .right {
+.page__status-bar-fill + ons-toolbar[modifier~="material"] > .center,
+.page__status-bar-fill + ons-toolbar[modifier~="material"] > .left,
+.page__status-bar-fill + ons-toolbar[modifier~="material"] > .right {
   height: 76px;
 }
 
@@ -99,7 +99,7 @@ ons-toolbar + .page__background + .page__content {
   padding-top: 0px;
 }
 
-.page__status-bar-fill + ons-toolbar[modifier="material"] + .page__background + .page__content {
+.page__status-bar-fill + ons-toolbar[modifier~="material"] + .page__background + .page__content {
   top: 76px;
 }
 
@@ -126,6 +126,18 @@ ons-toolbar + .page__background + .page__content {
   padding-top: 22px;
 }
 
+ons-tabbar[position="top"] .page__status-bar-fill + .page__background + .page__content {
+  padding-top: 0px;
+}
+
+ons-toolbar + .page__background + .page__content ons-tabbar > .tab-bar__status-bar-fill + .tab-bar--top__content {
+  top: 49px;
+}
+
+ons-toolbar + .page__background + .page__content ons-tabbar > .tab-bar__status-bar-fill + .tab-bar--top__content + .tab-bar--top {
+  padding-top: 0px;
+}
+
 ons-dialog[disabled] > .dialog,
 ons-alert-dialog[disabled],
 ons-popover[disabled] {

diff --git a/core/elements/ons-page.es6 b/core/elements/ons-page.es6
@@ -53,6 +53,8 @@ limitations under the License.
       if(!util.hasAnyComponentAsParent(this)) {
         this._show();
       }
+
+      this._tryToFillStatusBar();
     }
 
     /**
@@ -217,8 +219,6 @@ limitations under the License.
       fragment.appendChild(content);
 
       this.appendChild(fragment);
-
-      this._tryToFillStatusBar();
     }
 
     _registerExtraElement(element) {

diff --git a/core/elements/ons-tabbar.es6 b/core/elements/ons-tabbar.es6
@@ -240,6 +240,9 @@ limitations under the License.
      * @param {Number} options.previousTabIndex
      */
     _switchPage(element, options) {
+      if (this._hasTopTabbar()) {
+        element.setAttribute('no-status-bar-fill', '');
+      }
 
       if (this.getActiveTabIndex() !== -1) {
         var oldPageElement = this._oldPageElement || ons._internal.nullElement;