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
aad447e2
Commit
aad447e2
authored
11 years ago
by
Zlatan Vasović
Browse files
Options
Download
Email Patches
Plain Diff
Fix
#11400
and
#11431
parent
463343af
1 merge request
!11435
Fix #11400 and #11431
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/css/bootstrap.css
+8
-0
dist/css/bootstrap.css
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
less/input-groups.less
+21
-11
less/input-groups.less
with
30 additions
and
12 deletions
+30
-12
dist/css/bootstrap.css
+
8
-
0
View file @
aad447e2
...
@@ -4031,10 +4031,18 @@ textarea.input-group-sm > .input-group-btn > .btn {
...
@@ -4031,10 +4031,18 @@ textarea.input-group-sm > .input-group-btn > .btn {
position
:
relative
;
position
:
relative
;
}
}
.input-group-btn
>
.btn
:not
(
:first-of-type
)
:not
(
:last-of-type
)
{
border-radius
:
0
;
}
.input-group-btn
>
.btn
+
.btn
{
.input-group-btn
>
.btn
+
.btn
{
margin-left
:
-4px
;
margin-left
:
-4px
;
}
}
.input-group-btn
>
.btn
+
.btn
:last-of-type
{
margin-left
:
-5px
;
}
.input-group-btn
>
.btn
:hover
,
.input-group-btn
>
.btn
:hover
,
.input-group-btn
>
.btn
:active
{
.input-group-btn
>
.btn
:active
{
z-index
:
2
;
z-index
:
2
;
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
aad447e2
This source diff could not be displayed because it is too large. You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
less/input-groups.less
+
21
-
11
View file @
aad447e2
...
@@ -121,16 +121,26 @@
...
@@ -121,16 +121,26 @@
&:last-child > .btn {
&:last-child > .btn {
margin-left: -1px;
margin-left: -1px;
}
}
}
.input-group-btn > .btn {
> .btn {
position: relative;
position: relative;
// Jankily prevent input button groups from wrapping
+ .btn {
&:not(:first-of-type):not(:last-of-type) {
margin-left: -4px;
border-radius: 0;
}
}
// Bring the "active" button to the front
&:hover,
// Jankily prevent input button groups from wrapping
&:active {
+ .btn {
z-index: 2;
margin-left: -4px;
}
+ .btn:last-of-type {
margin-left: -5px;
}
// Bring the "active" button to the front
&:hover,
&:active {
z-index: 2;
}
}
}
}
}
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