Commit e7b0f4e8 authored by Mark Otto's avatar Mark Otto

Merge pull request #8564 from frabrunelle/3.0.0-wip

@badge-bg should be @gray-light not #f5f5f5
parents 0b1ddeb3 4b9cacae
...@@ -920,7 +920,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge ...@@ -920,7 +920,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
<input type="text" placeholder="#fff"> <input type="text" placeholder="#fff">
<p>Badge text color</p> <p>Badge text color</p>
<label>@badge-bg</label> <label>@badge-bg</label>
<input type="text" placeholder="@gray-lighter"> <input type="text" placeholder="@gray-light">
<p>Badge background color</p> <p>Badge background color</p>
<label>@badge-link-hover-color</label> <label>@badge-link-hover-color</label>
<input type="text" placeholder="#fff"> <input type="text" placeholder="#fff">
......
...@@ -4075,7 +4075,7 @@ a.thumbnail:focus { ...@@ -4075,7 +4075,7 @@ a.thumbnail:focus {
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
background-color: #f5f5f5; background-color: #999999;
border-radius: 10px; border-radius: 10px;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
@badge-color: #fff; @badge-color: #fff;
@badge-link-hover-color: #fff; @badge-link-hover-color: #fff;
@badge-bg: #f5f5f5; @badge-bg: @gray-light;
@badge-active-color: @link-color; @badge-active-color: @link-color;
@badge-active-bg: #fff; @badge-active-bg: #fff;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment