summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--css/normalize.css161
1 files changed, 117 insertions, 44 deletions
diff --git a/css/normalize.css b/css/normalize.css
index 7e7bab9..4474dee 100644
--- a/css/normalize.css
+++ b/css/normalize.css
@@ -1,4 +1,4 @@
-/*! normalize.css 2011-09-22T17:42 UTC - http://github.com/necolas/normalize.css */
+/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
/* =============================================================================
HTML5 display definitions
@@ -17,7 +17,8 @@ footer,
header,
hgroup,
nav,
-section {
+section,
+summary {
display: block;
}
@@ -35,10 +36,12 @@ video {
/*
* Prevents modern browsers from displaying 'audio' without controls
+ * Remove excess height in iOS5 devices
*/
audio:not([controls]) {
display: none;
+ height: 0;
}
/*
@@ -58,31 +61,21 @@ audio:not([controls]) {
/*
* 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
* http://clagnut.com/blog/348/#c790
- * 2. Keeps page centred in all browsers regardless of content height
- * 3. Prevents iOS text size adjust after orientation change, without disabling user zoom
+ * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
*/
html {
font-size: 100%; /* 1 */
- overflow-y: scroll; /* 2 */
- -webkit-text-size-adjust: 100%; /* 3 */
- -ms-text-size-adjust: 100%; /* 3 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+ -ms-text-size-adjust: 100%; /* 2 */
}
/*
- * Addresses margins handled incorrectly in IE6/7
- */
-
-body {
- margin: 0;
-}
-
-/*
* Addresses font-family inconsistency between 'textarea' and other form elements.
*/
-body,
+html,
button,
input,
select,
@@ -90,19 +83,19 @@ textarea {
font-family: sans-serif;
}
+/*
+ * Addresses margins handled incorrectly in IE6/7
+ */
+
+body {
+ margin: 0;
+}
+
/* =============================================================================
Links
========================================================================== */
-a {
- color: #00e;
-}
-
-a:visited {
- color: #551a8b;
-}
-
/*
* Addresses outline displayed oddly in Chrome
*/
@@ -127,6 +120,41 @@ a:active {
========================================================================== */
/*
+ * Addresses font sizes and margins set differently in IE6/7
+ * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
+ */
+
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
+}
+
+h2 {
+ font-size: 1.5em;
+ margin: 0.83em 0;
+}
+
+h3 {
+ font-size: 1.17em;
+ margin: 1em 0;
+}
+
+h4 {
+ font-size: 1em;
+ margin: 1.33em 0;
+}
+
+h5 {
+ font-size: 0.83em;
+ margin: 1.67em 0;
+}
+
+h6 {
+ font-size: 0.75em;
+ margin: 2.33em 0;
+}
+
+/*
* Addresses styling not present in IE7/8/9, S5, Chrome
*/
@@ -135,12 +163,12 @@ abbr[title] {
}
/*
- * Addresses style set to 'bolder' in FF3/4, S4/5, Chrome
+ * Addresses style set to 'bolder' in FF3+, S4/5, Chrome
*/
-b,
-strong {
- font-weight: bold;
+b,
+strong {
+ font-weight: bold;
}
blockquote {
@@ -165,6 +193,15 @@ mark {
}
/*
+ * Addresses margins set differently in IE6/7
+ */
+
+p,
+pre {
+ margin: 1em 0;
+}
+
+/*
* Corrects font family set oddly in IE6, S4/5, Chrome
* en.wikipedia.org/wiki/User:Davidgothberg/Test59
*/
@@ -237,16 +274,35 @@ sub {
Lists
========================================================================== */
-ul,
-ol {
+/*
+ * Addresses margins set differently in IE6/7
+ */
+
+dl,
+menu,
+ol,
+ul {
margin: 1em 0;
- padding: 0 0 0 40px;
}
dd {
margin: 0 0 0 40px;
}
+/*
+ * Addresses paddings set differently in IE6/7
+ */
+
+menu,
+ol,
+ul {
+ padding: 0 0 0 40px;
+}
+
+/*
+ * Corrects list images handled incorrectly in IE7
+ */
+
nav ul,
nav ol {
list-style: none;
@@ -270,7 +326,7 @@ img {
}
/*
- * Corrects overflow displayed oddly in IE9
+ * Corrects overflow displayed oddly in IE9
*/
svg:not(:root) {
@@ -315,17 +371,20 @@ fieldset {
/*
* 1. Corrects color not being inherited in IE6/7/8/9
- * 2. Corrects alignment displayed oddly in IE6/7
+ * 2. Corrects text not wrapping in FF3
+ * 3. Corrects alignment displayed oddly in IE6/7
*/
legend {
border: 0; /* 1 */
- *margin-left: -7px; /* 2 */
+ padding: 0;
+ white-space: normal; /* 2 */
+ *margin-left: -7px; /* 3 */
}
/*
* 1. Corrects font size not being inherited in all browsers
- * 2. Addresses margins set differently in IE6/7, FF3/4, S5, Chrome
+ * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
* 3. Improves appearance and consistency in all browsers
*/
@@ -351,13 +410,13 @@ input {
/*
* 1. Improves usability and consistency of cursor style between image-type 'input' and others
* 2. Corrects inability to style clickable 'input' types in iOS
- * 3. Corrects inner spacing displayed oddly in IE7 without effecting normal text inputs
+ * 3. Removes inner spacing in IE7 without affecting normal text inputs
* Known issue: inner spacing remains in IE6
*/
button,
-input[type="button"],
-input[type="reset"],
+input[type="button"],
+input[type="reset"],
input[type="submit"] {
cursor: pointer; /* 1 */
-webkit-appearance: button; /* 2 */
@@ -365,19 +424,32 @@ input[type="submit"] {
}
/*
+ * Re-set default cursor for disabled elements
+ */
+
+button[disabled],
+input[disabled] {
+ cursor: default;
+}
+
+/*
* 1. Addresses box sizing set to content-box in IE8/9
- * 2. Addresses excess padding in IE8/9
+ * 2. Removes excess padding in IE8/9
+ * 3. Removes excess padding in IE7
+ Known issue: excess padding remains in IE6
*/
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
+ *height: 13px; /* 3 */
+ *width: 13px; /* 3 */
}
/*
* 1. Addresses appearance set to searchfield in S5, Chrome
- * 2. Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof)
+ * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
*/
input[type="search"] {
@@ -388,15 +460,16 @@ input[type="search"] {
}
/*
- * Corrects inner padding displayed oddly in S5, Chrome on OSX
+ * Removes inner padding and search cancel button in S5, Chrome on OS X
*/
-input[type="search"]::-webkit-search-decoration {
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
}
/*
- * Corrects inner padding and border displayed oddly in FF3/4
+ * Removes inner padding and border in FF3+
* www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
*/
@@ -421,7 +494,7 @@ textarea {
Tables
========================================================================== */
-/*
+/*
* Remove most spacing between table cells
*/