diff options
| author | Mark Otto <[email protected]> | 2013-08-14 22:59:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-14 22:59:02 -0700 |
| commit | c5ca743cb7a3e4ca17979854f35d21d91a7b6ef7 (patch) | |
| tree | df8bfd46f9f726c545ce879c82ede280427d6a66 /dist/css/bootstrap.css | |
| parent | 70b0fb445ee373811ea952a0936493c4f574fba2 (diff) | |
| parent | ef60b0e5fbccbd16b964c1397a7f4cc4c9b51663 (diff) | |
| download | bootstrap-c5ca743cb7a3e4ca17979854f35d21d91a7b6ef7.tar.xz bootstrap-c5ca743cb7a3e4ca17979854f35d21d91a7b6ef7.zip | |
Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d3aa21703..ec29240c8 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -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; |