rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pr/11868

Browse source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-12-14 11:36:54 -08:00
commit ecc6f4e6bc
7 changed files with 113 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dist/css/bootstrap.css vendored
View file

@ -3618,6 +3618,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-brand:focus {
text-decoration: none;
}
.navbar-brand > .glyphicon {
float: left;
margin-top: -2px;
margin-right: 5px;
}
@media (min-width: 768px) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {