2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00

Merge pull request #8564 from frabrunelle/3.0.0-wip

@badge-bg should be @gray-light not #f5f5f5
This commit is contained in:
Mark Otto
2013-07-23 10:05:49 -07:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -920,7 +920,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<input type="text" placeholder="#fff">
<p>Badge text color</p>
<label>@badge-bg</label>
<input type="text" placeholder="@gray-lighter">
<input type="text" placeholder="@gray-light">
<p>Badge background color</p>
<label>@badge-link-hover-color</label>
<input type="text" placeholder="#fff">
+1 -1
View File
@@ -4075,7 +4075,7 @@ a.thumbnail:focus {
text-align: center;
white-space: nowrap;
vertical-align: middle;
background-color: #f5f5f5;
background-color: #999999;
border-radius: 10px;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -379,7 +379,7 @@
@badge-color: #fff;
@badge-link-hover-color: #fff;
@badge-bg: #f5f5f5;
@badge-bg: @gray-light;
@badge-active-color: @link-color;
@badge-active-bg: #fff;