Merge pull request #392 from twbs/tab-padding

Fix padding for android tab bar
twbs · Mar 3, 2014 · bf64cad · bf64cad
2 parents 6f0b519 + 2cc5013
commit bf64cad
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 11 deletions.
diff --git a/dist/ratchet-theme-android.css b/dist/ratchet-theme-android.css
@@ -30,12 +30,21 @@ a:active {
   padding-top: 50px;
 }
 
+.bar-header-secondary ~ .content {
+  padding-top: 100px;
+}
+
 .bar-tab ~ .content {
+  padding-top: 50px;
+  padding-bottom: 0;
+}
+
+.bar-footer ~ .content {
   padding-bottom: 50px;
 }
 
-.bar-header-secondary ~ .content {
-  padding-top: 100px;
+.bar-footer-secondary ~ .content {
+  padding-bottom: 100px;
 }
 
 .btn {

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -1615,11 +1615,18 @@ hr {
 .platform-android .bar-nav ~ .content {
   padding-top: 50px;
 }
+.platform-android .bar-header-secondary ~ .content {
+  padding-top: 100px;
+}
 .platform-android .bar-tab ~ .content {
+  padding-top: 50px;
+  padding-bottom: 0;
+}
+.platform-android .bar-footer ~ .content {
   padding-bottom: 50px;
 }
-.platform-android .bar-header-secondary ~ .content {
-  padding-top: 100px;
+.platform-android .bar-footer-secondary ~ .content {
+  padding-bottom: 100px;
 }
 .platform-android .btn {
   padding: 8px 15px;

diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
diff --git a/docs/dist/ratchet-theme-android.css b/docs/dist/ratchet-theme-android.css
@@ -30,12 +30,21 @@ a:active {
   padding-top: 50px;
 }
 
+.bar-header-secondary ~ .content {
+  padding-top: 100px;
+}
+
 .bar-tab ~ .content {
+  padding-top: 50px;
+  padding-bottom: 0;
+}
+
+.bar-footer ~ .content {
   padding-bottom: 50px;
 }
 
-.bar-header-secondary ~ .content {
-  padding-top: 100px;
+.bar-footer-secondary ~ .content {
+  padding-bottom: 100px;
 }
 
 .btn {

diff --git a/sass/theme-android.scss b/sass/theme-android.scss
@@ -66,13 +66,19 @@ a {
 .bar-nav ~ .content {
   padding-top: $bar-base-height;
 }
-.bar-tab ~ .content {
-  padding-bottom: $bar-tab-height;
-}
 .bar-header-secondary ~ .content {
   padding-top: $bar-base-height*2;
 }
-
+.bar-tab ~ .content {
+  padding-top: $bar-tab-height;
+  padding-bottom: 0;
+}
+.bar-footer ~ .content {
+  padding-bottom: $bar-base-height;
+}
+.bar-footer-secondary ~ .content {
+  padding-bottom: ($bar-base-height*2);
+}
 
 // Buttons
 // --------------------------------------------------