rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-07-23 10:19:04 -07:00
commit b5f2482a58
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.html
View File

@ -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">

2
dist/css/bootstrap.css vendored
View File

@ -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;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/variables.less
View File

@ -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;