From 927edfffcd6b73f336a582a38d31619f0840c114 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 17 Jun 2016 13:51:30 -0400 Subject: [PATCH] refactor(tabs): remove all uses of ion-navbar-section --- demos/tabs/style.css | 11 +++++------ src/components/tabs/test/badges/styles.css | 13 ++++++------- src/components/tabs/test/colors/styles.css | 13 ++++++------- .../tabs/test/tab-bar-scenarios/styles.css | 14 ++++++-------- src/components/toolbar/toolbar.ios.scss | 4 ---- src/components/toolbar/toolbar.md.scss | 4 ---- src/components/toolbar/toolbar.wp.scss | 4 ---- 7 files changed, 23 insertions(+), 40 deletions(-) diff --git a/demos/tabs/style.css b/demos/tabs/style.css index 6bf7b74e17..b070d0b2f3 100644 --- a/demos/tabs/style.css +++ b/demos/tabs/style.css @@ -1,11 +1,10 @@ ion-tabs[no-navbar] { - position: relative; - top: auto; - height: auto; margin-bottom: 20px; } -ion-tabs[no-navbar] > ion-navbar-section, -ion-tabs[no-navbar] > ion-content-section { - display: none !important; +ion-tabs[no-navbar], +ion-tabs[no-navbar] ion-tabbar { + position: relative; + top: auto; + height: auto; } diff --git a/src/components/tabs/test/badges/styles.css b/src/components/tabs/test/badges/styles.css index b5b6cbf640..3385d168a4 100644 --- a/src/components/tabs/test/badges/styles.css +++ b/src/components/tabs/test/badges/styles.css @@ -1,12 +1,11 @@ - ion-tabs { - position: relative; - top: auto; - height: auto; margin-bottom: 20px; } -ion-navbar-section, -ion-content-section { - display: none !important; +ion-tabs, +ion-tabs ion-tabbar { + position: relative; + top: auto; + height: auto; + visibility: visible; } diff --git a/src/components/tabs/test/colors/styles.css b/src/components/tabs/test/colors/styles.css index b5b6cbf640..3385d168a4 100644 --- a/src/components/tabs/test/colors/styles.css +++ b/src/components/tabs/test/colors/styles.css @@ -1,12 +1,11 @@ - ion-tabs { - position: relative; - top: auto; - height: auto; margin-bottom: 20px; } -ion-navbar-section, -ion-content-section { - display: none !important; +ion-tabs, +ion-tabs ion-tabbar { + position: relative; + top: auto; + height: auto; + visibility: visible; } diff --git a/src/components/tabs/test/tab-bar-scenarios/styles.css b/src/components/tabs/test/tab-bar-scenarios/styles.css index b5b6cbf640..b070d0b2f3 100644 --- a/src/components/tabs/test/tab-bar-scenarios/styles.css +++ b/src/components/tabs/test/tab-bar-scenarios/styles.css @@ -1,12 +1,10 @@ - -ion-tabs { - position: relative; - top: auto; - height: auto; +ion-tabs[no-navbar] { margin-bottom: 20px; } -ion-navbar-section, -ion-content-section { - display: none !important; +ion-tabs[no-navbar], +ion-tabs[no-navbar] ion-tabbar { + position: relative; + top: auto; + height: auto; } diff --git a/src/components/toolbar/toolbar.ios.scss b/src/components/toolbar/toolbar.ios.scss index 05dcf2aca2..f370cad925 100644 --- a/src/components/toolbar/toolbar.ios.scss +++ b/src/components/toolbar/toolbar.ios.scss @@ -36,10 +36,6 @@ $navbar-ios-height: $toolbar-ios-height !default; min-height: $toolbar-ios-height; } -ion-navbar-section { - min-height: $navbar-ios-height; -} - // iOS Toolbar Background // -------------------------------------------------- diff --git a/src/components/toolbar/toolbar.md.scss b/src/components/toolbar/toolbar.md.scss index 933ef063bb..63172891aa 100644 --- a/src/components/toolbar/toolbar.md.scss +++ b/src/components/toolbar/toolbar.md.scss @@ -35,10 +35,6 @@ $navbar-md-height: $toolbar-md-height !default; min-height: $toolbar-md-height; } -ion-navbar-section { - min-height: $navbar-md-height; -} - // Material Design Toolbar Background // -------------------------------------------------- diff --git a/src/components/toolbar/toolbar.wp.scss b/src/components/toolbar/toolbar.wp.scss index 133d636237..321c857529 100644 --- a/src/components/toolbar/toolbar.wp.scss +++ b/src/components/toolbar/toolbar.wp.scss @@ -37,10 +37,6 @@ $navbar-wp-height: $toolbar-wp-height !default; min-height: $toolbar-wp-height; } -ion-navbar-section { - min-height: $navbar-wp-height; -} - // Windows Toolbar Background // --------------------------------------------------