Commit c5ca743c authored by Mark Otto's avatar Mark Otto

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

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

Conflicts:
	dist/css/bootstrap.min.css
parents 70b0fb44 ef60b0e5
...@@ -3240,7 +3240,6 @@ button.close { ...@@ -3240,7 +3240,6 @@ button.close {
float: left; float: left;
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
margin-right: 7.5px;
font-size: 18px; font-size: 18px;
line-height: 20px; line-height: 20px;
color: #777777; color: #777777;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -121,7 +121,6 @@ ...@@ -121,7 +121,6 @@
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-right: (@navbar-padding-horizontal / 2);
padding-top: @navbar-padding-vertical; padding-top: @navbar-padding-vertical;
padding-bottom: @navbar-padding-vertical; padding-bottom: @navbar-padding-vertical;
font-size: @font-size-large; font-size: @font-size-large;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment