From 7e756ef919cfa78ec9903d64fb81402b8fb6900c Mon Sep 17 00:00:00 2001 From: connors Date: Tue, 11 Feb 2014 23:09:42 -0800 Subject: [PATCH] no need to use divs to wrap labels --- components.html | 20 ++++++++++---------- dist/android-theme.css | 6 +++--- dist/ratchet.css | 7 ++++--- docs-assets/css/docs.css | 6 +++--- lib/sass/bars.scss | 1 + 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/components.html b/components.html index 1c67748..302c843 100644 --- a/components.html +++ b/components.html @@ -202,23 +202,23 @@ base_url: "../" @@ -227,23 +227,23 @@ base_url: "../" {% endhighlight %} diff --git a/dist/android-theme.css b/dist/android-theme.css index aad9b32..977c8bf 100644 --- a/dist/android-theme.css +++ b/dist/android-theme.css @@ -175,12 +175,12 @@ a:active { height: 50px; border-top: 0; } -.bar-tab .tab-item .icon { - margin-top: 5px; -} .bar-tab .tab-item.active, .bar-tab .tab-item:active { color: #33b5e5; } +.bar-tab .tab-item .icon { + margin-top: 5px; +} .title { position: static; diff --git a/dist/ratchet.css b/dist/ratchet.css index 8b34ce5..c3febe7 100644 --- a/dist/ratchet.css +++ b/dist/ratchet.css @@ -528,18 +528,19 @@ input[type="button"] { color: #929292; text-align: center; } +.bar-tab .tab-item.active, .bar-tab .tab-item:active { + color: #428bca; +} .bar-tab .tab-item .icon { width: 24px; height: 24px; margin-top: 5px; } .bar-tab .tab-item .icon ~ .tab-label { + display: block; margin-top: -2px; font-size: 11px; } -.bar-tab .tab-item.active, .bar-tab .tab-item:active { - color: #428bca; -} .bar-nav .btn { position: relative; diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index ceccead..4d74299 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1345,12 +1345,12 @@ hr { height: 50px; border-top: 0; } -.platform-android .bar-tab .tab-item .icon { - margin-top: 5px; -} .platform-android .bar-tab .tab-item.active, .platform-android .bar-tab .tab-item:active { color: #33b5e5; } +.platform-android .bar-tab .tab-item .icon { + margin-top: 5px; +} .platform-android .title { position: static; padding-left: 15px; diff --git a/lib/sass/bars.scss b/lib/sass/bars.scss index 4a2f5ff..1ca55df 100644 --- a/lib/sass/bars.scss +++ b/lib/sass/bars.scss @@ -108,6 +108,7 @@ // Make the label smaller if it's used with an icon ~ .tab-label { + display: block; margin-top: -2px; font-size: 11px; }