2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-14 22:59:02 -07:00
3 changed files with 1 additions and 3 deletions
-1
View File
@@ -3240,7 +3240,6 @@ button.close {
float: left;
padding-top: 15px;
padding-bottom: 15px;
margin-right: 7.5px;
font-size: 18px;
line-height: 20px;
color: #777777;