This commit is contained in:
Mark Otto 2016-02-07 23:49:09 -08:00
parent 9c3ba540b4
commit ba4d52ef29
8 changed files with 56 additions and 54 deletions

View File

@ -3345,6 +3345,7 @@ input[type="button"].btn-block {
.input-group { .input-group {
position: relative; position: relative;
width: 100%;
display: table; display: table;
border-collapse: separate; border-collapse: separate;
} }
@ -3414,33 +3415,33 @@ input[type="button"].btn-block {
margin-top: 0; margin-top: 0;
} }
.input-group .form-control:first-child, .input-group .form-control:not(:last-child),
.input-group-addon:first-child, .input-group-addon:not(:last-child),
.input-group-btn:first-child > .btn, .input-group-btn:not(:last-child) > .btn,
.input-group-btn:first-child > .btn-group > .btn, .input-group-btn:not(:last-child) > .btn-group > .btn,
.input-group-btn:first-child > .dropdown-toggle, .input-group-btn:not(:last-child) > .dropdown-toggle,
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:not(:first-child) > .btn:not(:last-child):not(.dropdown-toggle),
.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { .input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.input-group-addon:first-child { .input-group-addon:not(:last-child) {
border-right: 0; border-right: 0;
} }
.input-group .form-control:last-child, .input-group .form-control:not(:first-child),
.input-group-addon:last-child, .input-group-addon:not(:first-child),
.input-group-btn:last-child > .btn, .input-group-btn:not(:first-child) > .btn,
.input-group-btn:last-child > .btn-group > .btn, .input-group-btn:not(:first-child) > .btn-group > .btn,
.input-group-btn:last-child > .dropdown-toggle, .input-group-btn:not(:first-child) > .dropdown-toggle,
.input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:not(:last-child) > .btn:not(:first-child),
.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { .input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
} }
.input-group-addon:last-child { .form-control + .input-group-addon:not(:first-child) {
border-left: 0; border-left: 0;
} }
@ -3462,21 +3463,21 @@ input[type="button"].btn-block {
z-index: 3; z-index: 3;
} }
.input-group-btn:first-child > .btn, .input-group-btn:not(:last-child) > .btn,
.input-group-btn:first-child > .btn-group { .input-group-btn:not(:last-child) > .btn-group {
margin-right: -1px; margin-right: -1px;
} }
.input-group-btn:last-child > .btn, .input-group-btn:not(:first-child) > .btn,
.input-group-btn:last-child > .btn-group { .input-group-btn:not(:first-child) > .btn-group {
z-index: 2; z-index: 2;
margin-left: -1px; margin-left: -1px;
} }
.input-group-btn:last-child > .btn:focus, .input-group-btn:last-child > .btn:active, .input-group-btn:last-child > .btn:hover, .input-group-btn:not(:first-child) > .btn:focus, .input-group-btn:not(:first-child) > .btn:active, .input-group-btn:not(:first-child) > .btn:hover,
.input-group-btn:last-child > .btn-group:focus, .input-group-btn:not(:first-child) > .btn-group:focus,
.input-group-btn:last-child > .btn-group:active, .input-group-btn:not(:first-child) > .btn-group:active,
.input-group-btn:last-child > .btn-group:hover { .input-group-btn:not(:first-child) > .btn-group:hover {
z-index: 3; z-index: 3;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3345,6 +3345,7 @@ input[type="button"].btn-block {
.input-group { .input-group {
position: relative; position: relative;
width: 100%;
display: table; display: table;
border-collapse: separate; border-collapse: separate;
} }
@ -3414,33 +3415,33 @@ input[type="button"].btn-block {
margin-top: 0; margin-top: 0;
} }
.input-group .form-control:first-child, .input-group .form-control:not(:last-child),
.input-group-addon:first-child, .input-group-addon:not(:last-child),
.input-group-btn:first-child > .btn, .input-group-btn:not(:last-child) > .btn,
.input-group-btn:first-child > .btn-group > .btn, .input-group-btn:not(:last-child) > .btn-group > .btn,
.input-group-btn:first-child > .dropdown-toggle, .input-group-btn:not(:last-child) > .dropdown-toggle,
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group-btn:not(:first-child) > .btn:not(:last-child):not(.dropdown-toggle),
.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { .input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.input-group-addon:first-child { .input-group-addon:not(:last-child) {
border-right: 0; border-right: 0;
} }
.input-group .form-control:last-child, .input-group .form-control:not(:first-child),
.input-group-addon:last-child, .input-group-addon:not(:first-child),
.input-group-btn:last-child > .btn, .input-group-btn:not(:first-child) > .btn,
.input-group-btn:last-child > .btn-group > .btn, .input-group-btn:not(:first-child) > .btn-group > .btn,
.input-group-btn:last-child > .dropdown-toggle, .input-group-btn:not(:first-child) > .dropdown-toggle,
.input-group-btn:first-child > .btn:not(:first-child), .input-group-btn:not(:last-child) > .btn:not(:first-child),
.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { .input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
} }
.input-group-addon:last-child { .form-control + .input-group-addon:not(:first-child) {
border-left: 0; border-left: 0;
} }
@ -3462,21 +3463,21 @@ input[type="button"].btn-block {
z-index: 3; z-index: 3;
} }
.input-group-btn:first-child > .btn, .input-group-btn:not(:last-child) > .btn,
.input-group-btn:first-child > .btn-group { .input-group-btn:not(:last-child) > .btn-group {
margin-right: -1px; margin-right: -1px;
} }
.input-group-btn:last-child > .btn, .input-group-btn:not(:first-child) > .btn,
.input-group-btn:last-child > .btn-group { .input-group-btn:not(:first-child) > .btn-group {
z-index: 2; z-index: 2;
margin-left: -1px; margin-left: -1px;
} }
.input-group-btn:last-child > .btn:focus, .input-group-btn:last-child > .btn:active, .input-group-btn:last-child > .btn:hover, .input-group-btn:not(:first-child) > .btn:focus, .input-group-btn:not(:first-child) > .btn:active, .input-group-btn:not(:first-child) > .btn:hover,
.input-group-btn:last-child > .btn-group:focus, .input-group-btn:not(:first-child) > .btn-group:focus,
.input-group-btn:last-child > .btn-group:active, .input-group-btn:not(:first-child) > .btn-group:active,
.input-group-btn:last-child > .btn-group:hover { .input-group-btn:not(:first-child) > .btn-group:hover {
z-index: 3; z-index: 3;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long