aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-13 17:55:23 -0800
committerMark Otto <[email protected]>2016-02-13 17:55:23 -0800
commit0c46412a4ce69f1fa8051b5dd73b6cc8401daf87 (patch)
tree9de22eefff352a51d0ef180373c3d28037b70b97 /docs/dist/css/bootstrap.css
parent09aefaa2afe05f438b99caa63bb888c62c40bf73 (diff)
parentceb0e9b69f0d0b1b606073f826b8a9083e8ff347 (diff)
downloadbootstrap-0c46412a4ce69f1fa8051b5dd73b6cc8401daf87.tar.xz
bootstrap-0c46412a4ce69f1fa8051b5dd73b6cc8401daf87.zip
Merge branch 'v4-dev' into v4-custom-forms-validation
Diffstat (limited to 'docs/dist/css/bootstrap.css')
-rw-r--r--docs/dist/css/bootstrap.css34
1 files changed, 14 insertions, 20 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
index 5bceee174..7a0705f70 100644
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -2088,7 +2088,9 @@ pre code {
color: #55595c;
background-color: #fff;
background-image: none;
- border: 1px solid #ccc;
+ -webkit-background-clip: padding-box;
+ background-clip: padding-box;
+ border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.25rem;
}
@@ -3390,7 +3392,7 @@ input[type="button"].btn-block {
color: #55595c;
text-align: center;
background-color: #eceeef;
- border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.25rem;
}
@@ -3587,7 +3589,7 @@ input[type="button"].btn-block {
background-image: none \9;
-webkit-background-size: 8px 10px;
background-size: 8px 10px;
- border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 0.25rem;
-moz-appearance: none;
-webkit-appearance: none;
@@ -3643,7 +3645,7 @@ input[type="button"].btn-block {
border-radius: 0.25rem;
}
-.custom-file-control::after {
+.custom-file-control:lang(en)::after {
content: "Choose file...";
}
@@ -3658,12 +3660,15 @@ input[type="button"].btn-block {
padding: 0.5rem 1rem;
line-height: 1.5;
color: #555;
- content: "Browse";
background-color: #eee;
border: 1px solid #ddd;
border-radius: 0 0.25rem 0.25rem 0;
}
+.custom-file-control:lang(en)::before {
+ content: "Browse";
+}
+
.nav {
padding-left: 0;
margin-bottom: 0;
@@ -4046,11 +4051,13 @@ input[type="button"].btn-block {
}
.card > .list-group:first-child .list-group-item:first-child {
- border-radius: 0.25rem 0.25rem 0 0;
+ border-top-left-radius: 0.25rem;
+ border-top-right-radius: 0.25rem;
}
.card > .list-group:last-child .list-group-item:last-child {
- border-radius: 0 0 0.25rem 0.25rem;
+ border-bottom-right-radius: 0.25rem;
+ border-bottom-left-radius: 0.25rem;
}
.card-header {
@@ -5257,19 +5264,6 @@ button.close {
clear: both;
}
-.modal-footer .btn + .btn {
- margin-bottom: 0;
- margin-left: 5px;
-}
-
-.modal-footer .btn-group .btn + .btn {
- margin-left: -1px;
-}
-
-.modal-footer .btn-block + .btn-block {
- margin-left: 0;
-}
-
.modal-scrollbar-measure {
position: absolute;
top: -9999px;