From a67c86e40f0b79e8abf5c6c266166db80d8edb72 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 15 Jan 2013 10:27:30 -0800 Subject: [PATCH] Fixes #6586: remove top 5px margin from navbar input group button groups --- docs/assets/css/bootstrap.css | 16 +++++++++++++++- less/navbar.less | 4 +++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57325606f2..71c42f3196 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -714,6 +714,18 @@ a.text-success:hover { color: #356635; } +.text-left { + text-align: left; +} + +.text-right { + text-align: right; +} + +.text-center { + text-align: center; +} + h1, h2, h3, @@ -4387,7 +4399,9 @@ input[type="submit"].btn.btn-mini { .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; } diff --git a/less/navbar.less b/less/navbar.less index 1e488d8983..cfbc30a6e6 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -95,7 +95,9 @@ } .navbar .btn-group .btn, .navbar .input-prepend .btn, -.navbar .input-append .btn { +.navbar .input-append .btn, +.navbar .input-prepend .btn-group, +.navbar .input-append .btn-group { margin-top: 0; // then undo the margin here so we don't accidentally double it }