Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
dad9889a
Commit
dad9889a
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#6657
: Upgrade Normalize to 2.1.0
parent
d53af49a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+13
-2
docs/assets/css/bootstrap.css
less/normalize.less
+30
-8
less/normalize.less
with
43 additions
and
10 deletions
+43
-10
docs/assets/css/bootstrap.css
+
13
-
2
View file @
dad9889a
...
...
@@ -18,6 +18,7 @@ figure,
footer
,
header
,
hgroup
,
main
,
nav
,
section
,
summary
{
...
...
@@ -59,6 +60,7 @@ a:hover {
}
h1
{
margin
:
0.67em
0
;
font-size
:
2em
;
}
...
...
@@ -75,6 +77,12 @@ dfn {
font-style
:
italic
;
}
hr
{
height
:
0
;
-moz-box-sizing
:
content-box
;
box-sizing
:
content-box
;
}
mark
{
color
:
#000
;
background
:
#ff0
;
...
...
@@ -89,8 +97,6 @@ samp {
}
pre
{
word-wrap
:
break-word
;
white-space
:
pre
;
white-space
:
pre-wrap
;
}
...
...
@@ -155,6 +161,11 @@ input {
line-height
:
normal
;
}
button
,
select
{
text-transform
:
none
;
}
button
,
html
input
[
type
=
"button"
],
input
[
type
=
"reset"
],
...
...
This diff is collapsed.
Click to expand it.
less/normalize.less
+
30
-
8
View file @
dad9889a
/*! normalize.css v2.
0.1
| MIT License | git.io/normalize */
/*! normalize.css v2.
1.0
| MIT License | git.io/normalize */
// ==========================================================================
// HTML5 display definitions
...
...
@@ -16,6 +16,7 @@ figure,
footer,
header,
hgroup,
main,
nav,
section,
summary {
...
...
@@ -100,12 +101,13 @@ a:hover {
// ==========================================================================
//
// Address variable `h1` font
size within `section` and `article`
contexts in
// Firefox 4+, Safari 5, and Chrome.
// Address variable `h1` font
-
size
and margin
within `section` and `article`
//
contexts in
Firefox 4+, Safari 5, and Chrome.
//
h1 {
font-size: 2em;
margin: 0.67em 0;
}
//
...
...
@@ -130,7 +132,17 @@ strong {
//
dfn {
font-style: italic;
font-style: italic;
}
//
// Address differences between Firefox and other browsers.
//
hr {
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
//
...
...
@@ -159,9 +171,7 @@ samp {
//
pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
}
//
...
...
@@ -217,7 +227,7 @@ img {
//
svg:not(:root) {
overflow: hidden;
overflow: hidden;
}
// ==========================================================================
...
...
@@ -229,7 +239,7 @@ svg:not(:root) {
//
figure {
margin: 0;
margin: 0;
}
// ==========================================================================
...
...
@@ -281,6 +291,18 @@ input {
line-height: normal;
}
//
// Address inconsistent `text-transform` inheritance for `button` and `select`.
// All other form control elements do not inherit `text-transform` values.
// Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
// Correct `select` style inheritance in Firefox 4+ and Opera.
//
button,
select {
text-transform: none;
}
//
// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
// and `video` controls.
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets