clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 12:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-14 22:59:02 -07:00
commit c5ca743cb7
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/bootstrap.css vendored
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;

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

File diff suppressed because one or more lines are too long

1
less/navbar.less
View File

@ -121,7 +121,6 @@
.navbar-brand {
float: left;
margin-right: (@navbar-padding-horizontal / 2);
padding-top: @navbar-padding-vertical;
padding-bottom: @navbar-padding-vertical;
font-size: @font-size-large;