aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-03 19:23:29 -0800
committerMark Otto <[email protected]>2016-02-03 19:23:29 -0800
commit0e70c6a37f1a648f86331498e7e898ca86a5d912 (patch)
treea1adab43cd51d99be99b36702ba9e1848e836962 /docs/dist/css/bootstrap.css
parent40525eaa4dd5bed19a0aab4c20602f613591c5fc (diff)
parent19be5360835e13c3087c37f0862aa9872f661bd7 (diff)
downloadbootstrap-0e70c6a37f1a648f86331498e7e898ca86a5d912.tar.xz
bootstrap-0e70c6a37f1a648f86331498e7e898ca86a5d912.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/dist/css/bootstrap.css')
-rw-r--r--docs/dist/css/bootstrap.css19
1 files changed, 7 insertions, 12 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
index 015db6410..439468590 100644
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -3,7 +3,7 @@
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css commit fe56763 | MIT License | github.com/necolas/normalize.css */
html {
font-family: sans-serif;
-webkit-text-size-adjust: 100%;
@@ -21,7 +21,6 @@ figcaption,
figure,
footer,
header,
-hgroup,
main,
menu,
nav,
@@ -188,8 +187,6 @@ input[type="number"]::-webkit-outer-spin-button {
}
input[type="search"] {
- -webkit-box-sizing: content-box;
- box-sizing: content-box;
-webkit-appearance: textfield;
}
@@ -230,7 +227,9 @@ th {
@media print {
*,
*::before,
- *::after {
+ *::after,
+ *::first-letter,
+ *::first-line {
text-shadow: none !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
@@ -255,9 +254,6 @@ th {
img {
page-break-inside: avoid;
}
- img {
- max-width: 100% !important;
- }
p,
h2,
h3 {
@@ -489,8 +485,6 @@ legend {
}
input[type="search"] {
- -webkit-box-sizing: inherit;
- box-sizing: inherit;
-webkit-appearance: none;
}
@@ -3156,6 +3150,7 @@ input[type="button"].btn-block {
.input-group-addon {
padding: .375rem .75rem;
+ margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
line-height: 1.5;
@@ -5090,7 +5085,7 @@ button.close {
letter-spacing: normal;
word-break: normal;
word-spacing: normal;
- word-wrap: normal;
+ word-wrap: break-word;
white-space: normal;
opacity: 0;
@@ -5191,7 +5186,7 @@ button.close {
letter-spacing: normal;
word-break: normal;
word-spacing: normal;
- word-wrap: normal;
+ word-wrap: break-word;
white-space: normal;
background-color: #fff;
-webkit-background-clip: padding-box;