github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-03-22 17:12:22 -07:00
parent fa1b3bdda4 99e96f64f7
commit b59cb505f8
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assets/css/bootstrap.css vendored
View File

@@ -113,9 +113,11 @@ textarea {
clear: both;
}
.hide-text {
overflow: hidden;
text-indent: 100%;
white-space: nowrap;
border: 0;
font: 0/0 a;
text-shadow: none;
color: transparent;
background-color: transparent;
}
.input-block-level {
display: block;
@@ -2866,7 +2868,7 @@ input[type="submit"].btn.btn-mini {
font-size: 20px;
font-weight: 200;
line-height: 1;
color: #ffffff;
color: #999999;
}
.navbar .navbar-text {
margin-bottom: 0;