Skip to content
GitLab
Commit c6ac4f56 authored by Mark Otto's avatar Mark Otto
Browse files

grunt

parent 85a71854
16 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!26437merge,!26197V4 dev xmr,!20778V4 dev,!20539Allow multiple modals,!20493V4 dev display,!20636Fix docs for heading sizes,!22547Finished a new translation for bootstrap,!22143Fix selectable disabled toggle radio buttons,!22598test,!21067dfsa,!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!17021v4
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 46 deletions
+76 -46
dist/css/bootstrap.css
+ 37
- 22
View file @ c6ac4f56
...@@ -2139,6 +2139,8 @@ pre code { ...@@ -2139,6 +2139,8 @@ pre code {
} }
.form-control:focus { .form-control:focus {
color: #55595c;
background-color: #fff;
border-color: #66afe9; border-color: #66afe9;
outline: none; outline: none;
} }
...@@ -2259,6 +2261,11 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for ...@@ -2259,6 +2261,11 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.form-text {
display: block;
margin-top: 0.25rem;
}
.form-check { .form-check {
position: relative; position: relative;
display: block; display: block;
...@@ -2308,7 +2315,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for ...@@ -2308,7 +2315,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
} }
.form-control-feedback { .form-control-feedback {
margin-top: .5rem; margin-top: 0.25rem;
} }
.form-control-success, .form-control-success,
...@@ -2447,19 +2454,16 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for ...@@ -2447,19 +2454,16 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }
.form-inline .radio, .form-inline .form-check {
.form-inline .checkbox {
display: inline-block; display: inline-block;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }
.form-inline .radio label, .form-inline .form-check-label {
.form-inline .checkbox label {
padding-left: 0; padding-left: 0;
} }
.form-inline .radio input[type="radio"], .form-inline .form-check-input {
.form-inline .checkbox input[type="checkbox"] {
position: relative; position: relative;
margin-left: 0; margin-left: 0;
} }
...@@ -3090,7 +3094,7 @@ fieldset[disabled] a.btn { ...@@ -3090,7 +3094,7 @@ fieldset[disabled] a.btn {
} }
.btn-block + .btn-block { .btn-block + .btn-block {
margin-top: 5px; margin-top: 0.5rem;
} }
input[type="submit"].btn-block, input[type="submit"].btn-block,
...@@ -3142,8 +3146,7 @@ input[type="button"].btn-block { ...@@ -3142,8 +3146,7 @@ input[type="button"].btn-block {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
margin-right: .25rem; margin-left: 0.3em;
margin-left: .25rem;
vertical-align: middle; vertical-align: middle;
content: ""; content: "";
border-top: 0.3em solid; border-top: 0.3em solid;
...@@ -3308,7 +3311,7 @@ input[type="button"].btn-block { ...@@ -3308,7 +3311,7 @@ input[type="button"].btn-block {
} }
.btn-toolbar { .btn-toolbar {
margin-left: -5px; margin-left: -0.5rem;
} }
.btn-toolbar::after { .btn-toolbar::after {
...@@ -3325,7 +3328,7 @@ input[type="button"].btn-block { ...@@ -3325,7 +3328,7 @@ input[type="button"].btn-block {
.btn-toolbar > .btn, .btn-toolbar > .btn,
.btn-toolbar > .btn-group, .btn-toolbar > .btn-group,
.btn-toolbar > .input-group { .btn-toolbar > .input-group {
margin-left: 5px; margin-left: 0.5rem;
} }
.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
...@@ -3371,14 +3374,23 @@ input[type="button"].btn-block { ...@@ -3371,14 +3374,23 @@ input[type="button"].btn-block {
outline: 0; outline: 0;
} }
.btn-group > .btn + .dropdown-toggle { .btn + .dropdown-toggle-split {
padding-right: 8px; padding-right: 0.75rem;
padding-left: 8px; padding-left: 0.75rem;
}
.btn + .dropdown-toggle-split::after {
margin-left: 0;
}
.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
padding-right: 0.375rem;
padding-left: 0.375rem;
} }
.btn-group > .btn-lg + .dropdown-toggle, .btn-group-lg.btn-group > .btn + .dropdown-toggle { .btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
padding-right: 12px; padding-right: 1.125rem;
padding-left: 12px; padding-left: 1.125rem;
} }
.btn .caret { .btn .caret {
...@@ -3851,7 +3863,8 @@ input[type="button"].btn-block { ...@@ -3851,7 +3863,8 @@ input[type="button"].btn-block {
display: block; display: block;
padding: 0.5em 1em; padding: 0.5em 1em;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 0.25rem 0.25rem 0 0; border-top-right-radius: 0.25rem;
border-top-left-radius: 0.25rem;
} }
.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover { .nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
...@@ -4176,8 +4189,8 @@ input[type="button"].btn-block { ...@@ -4176,8 +4189,8 @@ input[type="button"].btn-block {
} }
.card > .list-group:first-child .list-group-item:first-child { .card > .list-group:first-child .list-group-item:first-child {
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem; border-top-right-radius: 0.25rem;
border-top-left-radius: 0.25rem;
} }
.card > .list-group:last-child .list-group-item:last-child { .card > .list-group:last-child .list-group-item:last-child {
...@@ -4332,11 +4345,13 @@ input[type="button"].btn-block { ...@@ -4332,11 +4345,13 @@ input[type="button"].btn-block {
} }
.card-img-top { .card-img-top {
border-radius: 0.25rem 0.25rem 0 0; border-top-right-radius: 0.25rem;
border-top-left-radius: 0.25rem;
} }
.card-img-bottom { .card-img-bottom {
border-radius: 0 0 0.25rem 0.25rem; border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
} }
@media (min-width: 544px) { @media (min-width: 544px) {
......
dist/css/bootstrap.css.map
+143 bytes (+0%)
View file @ c6ac4f56
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/css/bootstrap.min.css
+ 1
- 1
View file @ c6ac4f56
This diff is collapsed.
dist/css/bootstrap.min.css.map
+69 bytes (+0%)
View file @ c6ac4f56
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.css
+ 37
- 22
View file @ c6ac4f56
...@@ -2139,6 +2139,8 @@ pre code { ...@@ -2139,6 +2139,8 @@ pre code {
} }
.form-control:focus { .form-control:focus {
color: #55595c;
background-color: #fff;
border-color: #66afe9; border-color: #66afe9;
outline: none; outline: none;
} }
...@@ -2259,6 +2261,11 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for ...@@ -2259,6 +2261,11 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.form-text {
display: block;
margin-top: 0.25rem;
}
.form-check { .form-check {
position: relative; position: relative;
display: block; display: block;
...@@ -2308,7 +2315,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for ...@@ -2308,7 +2315,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
} }
.form-control-feedback { .form-control-feedback {
margin-top: .5rem; margin-top: 0.25rem;
} }
.form-control-success, .form-control-success,
...@@ -2447,19 +2454,16 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for ...@@ -2447,19 +2454,16 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }
.form-inline .radio, .form-inline .form-check {
.form-inline .checkbox {
display: inline-block; display: inline-block;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
} }
.form-inline .radio label, .form-inline .form-check-label {
.form-inline .checkbox label {
padding-left: 0; padding-left: 0;
} }
.form-inline .radio input[type="radio"], .form-inline .form-check-input {
.form-inline .checkbox input[type="checkbox"] {
position: relative; position: relative;
margin-left: 0; margin-left: 0;
} }
...@@ -3090,7 +3094,7 @@ fieldset[disabled] a.btn { ...@@ -3090,7 +3094,7 @@ fieldset[disabled] a.btn {
} }
.btn-block + .btn-block { .btn-block + .btn-block {
margin-top: 5px; margin-top: 0.5rem;
} }
input[type="submit"].btn-block, input[type="submit"].btn-block,
...@@ -3142,8 +3146,7 @@ input[type="button"].btn-block { ...@@ -3142,8 +3146,7 @@ input[type="button"].btn-block {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
margin-right: .25rem; margin-left: 0.3em;
margin-left: .25rem;
vertical-align: middle; vertical-align: middle;
content: ""; content: "";
border-top: 0.3em solid; border-top: 0.3em solid;
...@@ -3308,7 +3311,7 @@ input[type="button"].btn-block { ...@@ -3308,7 +3311,7 @@ input[type="button"].btn-block {
} }
.btn-toolbar { .btn-toolbar {
margin-left: -5px; margin-left: -0.5rem;
} }
.btn-toolbar::after { .btn-toolbar::after {
...@@ -3325,7 +3328,7 @@ input[type="button"].btn-block { ...@@ -3325,7 +3328,7 @@ input[type="button"].btn-block {
.btn-toolbar > .btn, .btn-toolbar > .btn,
.btn-toolbar > .btn-group, .btn-toolbar > .btn-group,
.btn-toolbar > .input-group { .btn-toolbar > .input-group {
margin-left: 5px; margin-left: 0.5rem;
} }
.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
...@@ -3371,14 +3374,23 @@ input[type="button"].btn-block { ...@@ -3371,14 +3374,23 @@ input[type="button"].btn-block {
outline: 0; outline: 0;
} }
.btn-group > .btn + .dropdown-toggle { .btn + .dropdown-toggle-split {
padding-right: 8px; padding-right: 0.75rem;
padding-left: 8px; padding-left: 0.75rem;
}
.btn + .dropdown-toggle-split::after {
margin-left: 0;
}
.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
padding-right: 0.375rem;
padding-left: 0.375rem;
} }
.btn-group > .btn-lg + .dropdown-toggle, .btn-group-lg.btn-group > .btn + .dropdown-toggle { .btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
padding-right: 12px; padding-right: 1.125rem;
padding-left: 12px; padding-left: 1.125rem;
} }
.btn .caret { .btn .caret {
...@@ -3851,7 +3863,8 @@ input[type="button"].btn-block { ...@@ -3851,7 +3863,8 @@ input[type="button"].btn-block {
display: block; display: block;
padding: 0.5em 1em; padding: 0.5em 1em;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 0.25rem 0.25rem 0 0; border-top-right-radius: 0.25rem;
border-top-left-radius: 0.25rem;
} }
.nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover { .nav-tabs .nav-link:focus, .nav-tabs .nav-link:hover {
...@@ -4176,8 +4189,8 @@ input[type="button"].btn-block { ...@@ -4176,8 +4189,8 @@ input[type="button"].btn-block {
} }
.card > .list-group:first-child .list-group-item:first-child { .card > .list-group:first-child .list-group-item:first-child {
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem; border-top-right-radius: 0.25rem;
border-top-left-radius: 0.25rem;
} }
.card > .list-group:last-child .list-group-item:last-child { .card > .list-group:last-child .list-group-item:last-child {
...@@ -4332,11 +4345,13 @@ input[type="button"].btn-block { ...@@ -4332,11 +4345,13 @@ input[type="button"].btn-block {
} }
.card-img-top { .card-img-top {
border-radius: 0.25rem 0.25rem 0 0; border-top-right-radius: 0.25rem;
border-top-left-radius: 0.25rem;
} }
.card-img-bottom { .card-img-bottom {
border-radius: 0 0 0.25rem 0.25rem; border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
} }
@media (min-width: 544px) { @media (min-width: 544px) {
......
docs/dist/css/bootstrap.css.map
+143 bytes (+0%)
View file @ c6ac4f56
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ c6ac4f56
This diff is collapsed.
docs/dist/css/bootstrap.min.css.map
+69 bytes (+0%)
View file @ c6ac4f56
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment