aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Topper <[email protected]>2016-03-30 10:18:36 +0200
committerMark Topper <[email protected]>2016-03-30 10:18:36 +0200
commit0e2438b512af0299d30fc17a32f67560c16fd647 (patch)
treeaa049da5a6a6487a08dadd2cd89f8276b3e445e1
parent3f8ec6344b07427584c307843de2d9685de24a44 (diff)
downloadbootstrap-0e2438b512af0299d30fc17a32f67560c16fd647.tar.xz
bootstrap-0e2438b512af0299d30fc17a32f67560c16fd647.zip
Append HoundCi fixes
https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850395 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850397 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850398 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850401 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850399 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850402 https://github.com/twbs/bootstrap/pull/19639#discussion-diff-57850403
-rw-r--r--scss/_normalize.scss13
1 files changed, 6 insertions, 7 deletions
diff --git a/scss/_normalize.scss b/scss/_normalize.scss
index c95efe976..2b1238426 100644
--- a/scss/_normalize.scss
+++ b/scss/_normalize.scss
@@ -1,4 +1,4 @@
-/*! normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css */
+// normalize.css v4.0.0 | MIT License | github.com/necolas/normalize.css
//
// 1. Change the default font family in all browsers (opinionated).
@@ -111,8 +111,7 @@ a:hover {
//
abbr[title] {
- border-bottom: none; // 1
- text-decoration: underline; // 2
+ border-bottom: 0; // 1
text-decoration: underline dotted; // 2
}
@@ -157,8 +156,8 @@ h1 {
//
mark {
- background-color: #ff0;
color: #000;
+ background-color: #ff0;
}
//
@@ -187,7 +186,7 @@ sub {
}
sup {
- top: -0.5em;
+ top: -.5em;
}
// Embedded content
@@ -338,8 +337,8 @@ html [type="button"], // 1
button::-moz-focus-inner,
input::-moz-focus-inner {
- border: 0;
padding: 0;
+ border: 0;
}
//
@@ -370,10 +369,10 @@ fieldset {
legend {
box-sizing: border-box; // 1
- color: inherit; // 2
display: table; // 1
max-width: 100%; // 1
padding: 0; // 3
+ color: inherit; // 2
white-space: normal; // 1
}