2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
This commit is contained in:
Mark Otto
2017-12-22 17:15:46 -08:00
parent b23bf85faa
commit 5621c800aa
8 changed files with 31 additions and 19 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+24 -12
View File
@@ -583,22 +583,18 @@ samp {
} }
code { code {
padding: 0.2rem 0.4rem; font-size: 87.5%;
font-size: 90%; color: #e83e8c;
color: #bd4147; word-break: break-word;
background-color: #f8f9fa;
border-radius: 0.25rem;
} }
a > code { a > code {
padding: 0;
color: inherit; color: inherit;
background-color: inherit;
} }
kbd { kbd {
padding: 0.2rem 0.4rem; padding: 0.2rem 0.4rem;
font-size: 90%; font-size: 87.5%;
color: #fff; color: #fff;
background-color: #212529; background-color: #212529;
border-radius: 0.2rem; border-radius: 0.2rem;
@@ -612,16 +608,14 @@ kbd kbd {
pre { pre {
display: block; display: block;
font-size: 90%; font-size: 87.5%;
color: #212529; color: #212529;
} }
pre code { pre code {
padding: 0;
font-size: inherit; font-size: inherit;
color: inherit; color: inherit;
background-color: transparent; word-break: normal;
border-radius: 0;
} }
.pre-scrollable { .pre-scrollable {
@@ -1906,6 +1900,7 @@ select.form-control:focus::-ms-value {
.form-control-file, .form-control-file,
.form-control-range { .form-control-range {
display: block; display: block;
width: 100%;
} }
.col-form-label { .col-form-label {
@@ -3279,6 +3274,19 @@ tbody.collapse.show {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.input-group .custom-file {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
width: 100%;
}
.input-group .custom-file .custom-file-input {
width: 100%;
min-width: 0;
}
.input-group .custom-file:not(:first-child):not(:last-of-type) .custom-file-control, .input-group .custom-file:not(:first-child):not(:last-of-type) .custom-file-control,
.input-group .custom-file:not(:first-child):not(:last-of-type) .custom-file-control::before { .input-group .custom-file:not(:first-child):not(:last-of-type) .custom-file-control::before {
border-radius: 0; border-radius: 0;
@@ -3296,6 +3304,10 @@ tbody.collapse.show {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.input-group .custom-select {
width: 100%;
}
.input-group-prepend, .input-group-prepend,
.input-group-append { .input-group-append {
display: -ms-flexbox; display: -ms-flexbox;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long