mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 08:10:47 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
This commit is contained in:
Mark Otto
2013-08-05 16:03:10 -07:00
parent 9bbe8a020a 1aedb7862c
commit 04dc221037
10 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/css/bootstrap.css vendored
View File

@@ -1713,7 +1713,7 @@ textarea.input-sm {
padding: 6px 12px;
margin-bottom: 0;
font-size: 14px;
font-weight: 500;
font-weight: bold;
line-height: 1.428571429;
text-align: center;
white-space: nowrap;
@@ -1996,7 +1996,7 @@ fieldset[disabled] .btn-link {
fieldset[disabled] .btn-link:hover,
.btn-link[disabled]:focus,
fieldset[disabled] .btn-link:focus {
color: #333333;
color: #999999;
text-decoration: none;
}

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

File diff suppressed because one or more lines are too long