Browse Source

Merge pull request #392 from twbs/tab-padding

Fix padding for android tab bar
pull/394/head
Connor Sears 11 years ago
parent
commit
bf64cad6d7
  1. 13
      dist/ratchet-theme-android.css
  2. 11
      docs/assets/css/docs.css
  3. 2
      docs/assets/css/docs.min.css
  4. 13
      docs/dist/ratchet-theme-android.css
  5. 14
      sass/theme-android.scss

13
dist/ratchet-theme-android.css vendored

@ -30,12 +30,21 @@ a:active {
padding-top: 50px; padding-top: 50px;
} }
.bar-header-secondary ~ .content {
padding-top: 100px;
}
.bar-tab ~ .content { .bar-tab ~ .content {
padding-top: 50px;
padding-bottom: 0;
}
.bar-footer ~ .content {
padding-bottom: 50px; padding-bottom: 50px;
} }
.bar-header-secondary ~ .content { .bar-footer-secondary ~ .content {
padding-top: 100px; padding-bottom: 100px;
} }
.btn { .btn {

11
docs/assets/css/docs.css

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

2
docs/assets/css/docs.min.css vendored

File diff suppressed because one or more lines are too long

13
docs/dist/ratchet-theme-android.css vendored

@ -30,12 +30,21 @@ a:active {
padding-top: 50px; padding-top: 50px;
} }
.bar-header-secondary ~ .content {
padding-top: 100px;
}
.bar-tab ~ .content { .bar-tab ~ .content {
padding-top: 50px;
padding-bottom: 0;
}
.bar-footer ~ .content {
padding-bottom: 50px; padding-bottom: 50px;
} }
.bar-header-secondary ~ .content { .bar-footer-secondary ~ .content {
padding-top: 100px; padding-bottom: 100px;
} }
.btn { .btn {

14
sass/theme-android.scss

@ -66,13 +66,19 @@ a {
.bar-nav ~ .content { .bar-nav ~ .content {
padding-top: $bar-base-height; padding-top: $bar-base-height;
} }
.bar-tab ~ .content {
padding-bottom: $bar-tab-height;
}
.bar-header-secondary ~ .content { .bar-header-secondary ~ .content {
padding-top: $bar-base-height*2; 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 // Buttons
// -------------------------------------------------- // --------------------------------------------------

Loading…
Cancel
Save