Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
a67c86e4
Commit
a67c86e4
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#6586
: remove top 5px margin from navbar input group button groups
parent
c34ef691
3 merge requests
!6821
Typeahead updater
,
!6666
Patch 1
,
!6610
Add outline for input[type="image"]
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+15
-1
docs/assets/css/bootstrap.css
less/navbar.less
+3
-1
less/navbar.less
with
18 additions
and
2 deletions
+18
-2
docs/assets/css/bootstrap.css
+
15
-
1
View file @
a67c86e4
...
@@ -714,6 +714,18 @@ a.text-success:hover {
...
@@ -714,6 +714,18 @@ a.text-success:hover {
color
:
#356635
;
color
:
#356635
;
}
}
.text-left
{
text-align
:
left
;
}
.text-right
{
text-align
:
right
;
}
.text-center
{
text-align
:
center
;
}
h1
,
h1
,
h2
,
h2
,
h3
,
h3
,
...
@@ -4387,7 +4399,9 @@ input[type="submit"].btn.btn-mini {
...
@@ -4387,7 +4399,9 @@ input[type="submit"].btn.btn-mini {
.navbar
.btn-group
.btn
,
.navbar
.btn-group
.btn
,
.navbar
.input-prepend
.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
;
margin-top
:
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
3
-
1
View file @
a67c86e4
...
@@ -95,7 +95,9 @@
...
@@ -95,7 +95,9 @@
}
}
.navbar .btn-group .btn,
.navbar .btn-group .btn,
.navbar .input-prepend .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
margin-top: 0; // then undo the margin here so we don't accidentally double it
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets