Browse Source

fix up badges

pull/249/head
connors 11 years ago
parent
commit
b0f622bcc5
  1. 6
      components.html
  2. 7
      dist/ios-theme.css
  3. 2
      dist/ratchet.css
  4. 6
      docs-assets/css/docs.css
  5. 2
      lib/sass/badges.scss
  6. 8
      lib/sass/theme-ios.scss

6
components.html

@ -584,9 +584,9 @@ base_url: "../"
<a class="btn btn-negative">Badge button <span class="badge badge-negative">1</span></a> <a class="btn btn-negative">Badge button <span class="badge badge-negative">1</span></a>
<a class="btn btn-outlined">Badge button <span class="badge badge-inverted">1</span></a> <a class="btn btn-outlined">Badge button <span class="badge badge-inverted">1</span></a>
<a class="btn btn-outlined btn-primary">Badge button <span class="badge-primary badge-inverted">1</span></a> <a class="btn btn-outlined btn-primary">Badge button <span class="badge badge-primary badge-inverted">1</span></a>
<a class="btn btn-outlined btn-positive">Badge button <span class="badge-positive badge-inverted">1</span></a> <a class="btn btn-outlined btn-positive">Badge button <span class="badge badge-positive badge-inverted">1</span></a>
<a class="btn btn-outlined btn-negative">Badge button <span class="badge-negative badge-inverted">1</span></a> <a class="btn btn-outlined btn-negative">Badge button <span class="badge badge-negative badge-inverted">1</span></a>
{% endhighlight %} {% endhighlight %}
</article> </article>

7
dist/ios-theme.css vendored

@ -222,7 +222,6 @@ textarea,
.badge-primary { .badge-primary {
color: #fff; color: #fff;
background-color: #007aff;
} }
.badge-primary.badge-inverted { .badge-primary.badge-inverted {
color: #007aff; color: #007aff;
@ -230,7 +229,6 @@ textarea,
.badge-positive { .badge-positive {
color: #fff; color: #fff;
background-color: #4cd964;
} }
.badge-positive.badge-inverted { .badge-positive.badge-inverted {
color: #4cd964; color: #4cd964;
@ -238,12 +236,15 @@ textarea,
.badge-negative { .badge-negative {
color: #fff; color: #fff;
background-color: #dd524d;
} }
.badge-negative.badge-inverted { .badge-negative.badge-inverted {
color: #dd524d; color: #dd524d;
} }
.btn:active .badge-inverted {
color: #fff;
}
.segmented-control { .segmented-control {
color: #929292; color: #929292;
background-color: transparent; background-color: transparent;

2
dist/ratchet.css vendored

@ -791,7 +791,7 @@ input[type="button"] {
border-radius: 100px; border-radius: 100px;
} }
.badge.badge-inverted { .badge.badge-inverted {
padding: 0; padding: 0 5px 0 0;
background-color: transparent; background-color: transparent;
} }

6
docs-assets/css/docs.css

@ -992,25 +992,25 @@ hr {
} }
.platform-ios .badge-primary { .platform-ios .badge-primary {
color: #fff; color: #fff;
background-color: #007aff;
} }
.platform-ios .badge-primary.badge-inverted { .platform-ios .badge-primary.badge-inverted {
color: #007aff; color: #007aff;
} }
.platform-ios .badge-positive { .platform-ios .badge-positive {
color: #fff; color: #fff;
background-color: #4cd964;
} }
.platform-ios .badge-positive.badge-inverted { .platform-ios .badge-positive.badge-inverted {
color: #4cd964; color: #4cd964;
} }
.platform-ios .badge-negative { .platform-ios .badge-negative {
color: #fff; color: #fff;
background-color: #dd524d;
} }
.platform-ios .badge-negative.badge-inverted { .platform-ios .badge-negative.badge-inverted {
color: #dd524d; color: #dd524d;
} }
.platform-ios .btn:active .badge-inverted {
color: #fff;
}
.platform-ios .segmented-control { .platform-ios .segmented-control {
color: #929292; color: #929292;
background-color: transparent; background-color: transparent;

2
lib/sass/badges.scss

@ -12,7 +12,7 @@
border-radius: 100px; border-radius: 100px;
&.badge-inverted { &.badge-inverted {
padding: 0; padding: 0 5px 0 0;
background-color: transparent; background-color: transparent;
} }
} }

8
lib/sass/theme-ios.scss

@ -313,7 +313,6 @@ textarea,
// Main badge // Main badge
.badge-primary { .badge-primary {
color: #fff; color: #fff;
background-color: $primary-color;
&.badge-inverted { &.badge-inverted {
color: $primary-color; color: $primary-color;
@ -323,7 +322,6 @@ textarea,
// Positive badge // Positive badge
.badge-positive { .badge-positive {
color: #fff; color: #fff;
background-color: $positive-color;
&.badge-inverted { &.badge-inverted {
color: $positive-color; color: $positive-color;
@ -333,13 +331,17 @@ textarea,
// Negative badge // Negative badge
.badge-negative { .badge-negative {
color: #fff; color: #fff;
background-color: $negative-color;
&.badge-inverted { &.badge-inverted {
color: $negative-color; color: $negative-color;
} }
} }
// Active states
.btn:active .badge-inverted {
color: #fff;
}
// //
// Segmented controllers // Segmented controllers

Loading…
Cancel
Save