Browse Source

simplify bar-tab css

pull/253/head
connors 11 years ago
parent
commit
26cacd1639
  1. 4
      dist/android-theme.css
  2. 4
      dist/ios-theme.css
  3. 9
      dist/ratchet.css
  4. 8
      docs-assets/css/docs.css
  5. 17
      lib/sass/bars.scss
  6. 13
      lib/sass/theme-android.scss
  7. 5
      lib/sass/theme-ios.scss

4
dist/android-theme.css vendored

@ -178,9 +178,7 @@ a:active {
.bar-tab .tab-item .icon { .bar-tab .tab-item .icon {
margin-top: 5px; margin-top: 5px;
} }
.bar-tab .tab-item.active .tab-label, .bar-tab .tab-item.active, .bar-tab .tab-item:active {
.bar-tab .tab-item.active .icon, .bar-tab .tab-item:active .tab-label,
.bar-tab .tab-item:active .icon {
color: #33b5e5; color: #33b5e5;
} }

4
dist/ios-theme.css vendored

@ -138,9 +138,7 @@ p {
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85); box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
} }
.tab-item.active .tab-label, .tab-item.active, .tab-item:active {
.tab-item.active .icon, .tab-item:active .tab-label,
.tab-item:active .icon {
color: #007aff; color: #007aff;
} }

9
dist/ratchet.css vendored

@ -525,11 +525,8 @@ input[type="button"] {
height: 100%; height: 100%;
width: 1%; width: 1%;
vertical-align: middle; vertical-align: middle;
text-align: center;
}
.bar-tab .tab-item .tab-label,
.bar-tab .tab-item .icon {
color: #929292; color: #929292;
text-align: center;
} }
.bar-tab .tab-item .icon { .bar-tab .tab-item .icon {
width: 24px; width: 24px;
@ -540,9 +537,7 @@ input[type="button"] {
margin-top: -2px; margin-top: -2px;
font-size: 11px; font-size: 11px;
} }
.bar-tab .tab-item.active .tab-label, .bar-tab .tab-item.active, .bar-tab .tab-item:active {
.bar-tab .tab-item.active .icon, .bar-tab .tab-item:active .tab-label,
.bar-tab .tab-item:active .icon {
color: #428bca; color: #428bca;
} }

8
docs-assets/css/docs.css

@ -911,9 +911,7 @@ hr {
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85); -webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85); box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
} }
.platform-ios .tab-item.active .tab-label, .platform-ios .tab-item.active, .platform-ios .tab-item:active {
.platform-ios .tab-item.active .icon, .platform-ios .tab-item:active .tab-label,
.platform-ios .tab-item:active .icon {
color: #007aff; color: #007aff;
} }
.platform-ios .bar-nav .btn-link { .platform-ios .bar-nav .btn-link {
@ -1350,9 +1348,7 @@ hr {
.platform-android .bar-tab .tab-item .icon { .platform-android .bar-tab .tab-item .icon {
margin-top: 5px; margin-top: 5px;
} }
.platform-android .bar-tab .tab-item.active .tab-label, .platform-android .bar-tab .tab-item.active, .platform-android .bar-tab .tab-item:active {
.platform-android .bar-tab .tab-item.active .icon, .platform-android .bar-tab .tab-item:active .tab-label,
.platform-android .bar-tab .tab-item:active .icon {
color: #33b5e5; color: #33b5e5;
} }
.platform-android .title { .platform-android .title {

17
lib/sass/bars.scss

@ -91,11 +91,13 @@
height: 100%; height: 100%;
width: 1%; width: 1%;
vertical-align: middle; vertical-align: middle;
color: #929292;
text-align: center; text-align: center;
.tab-label, // Active states for the tab bar
.icon { &.active,
color: #929292; &:active {
color: $primary-color;
} }
// Tab icon // Tab icon
@ -110,15 +112,6 @@
font-size: 11px; font-size: 11px;
} }
} }
// Active states for the tab bar
&.active,
&:active {
.tab-label,
.icon {
color: $primary-color;
}
}
} }
} }

13
lib/sass/theme-android.scss

@ -258,17 +258,14 @@ a {
border-top: 0; border-top: 0;
.tab-item { .tab-item {
.icon {
margin-top: 5px;
}
// Active states for the tab bar // Active states for the tab bar
&.active, &.active,
&:active { &:active {
.tab-label, color: $primary-color;
.icon { }
color: $primary-color;
} .icon {
margin-top: 5px;
} }
} }
} }

5
lib/sass/theme-ios.scss

@ -209,10 +209,7 @@ p {
// Active states for the tab bar // Active states for the tab bar
&.active, &.active,
&:active { &:active {
.tab-label, color: $primary-color;
.icon {
color: $primary-color;
}
} }
} }

Loading…
Cancel
Save