Skip to content

Commit ba047db

Browse files
committed
Move font-size:100% into html ruleset, fix necolas#5. Remove placeholder body line-height.
1 parent ce0c346 commit ba047db

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

normalize.css

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,32 @@ video {
3939
========================================================================== */
4040

4141
/*
42-
* 1. Add vertical scrollbar
42+
* 1. Add font size
43+
* Addresses text resizing oddly in IE6/7 when body font-size is set using em units
44+
* http://clagnut.com/blog/348/#c790
45+
* 2. Add vertical scrollbar
4346
* Keeps page centred in all browsers regardless of content height
44-
* 2. Remove Android and iOS tap highlight color to prevent entire container being highlighted
47+
* 3. Remove Android and iOS tap highlight color to prevent entire container being highlighted
4548
* www.yuiblog.com/blog/2010/10/01/quick-tip-customizing-the-mobile-safari-tap-highlight-color/
46-
* 3. Remove iOS text size adjust without disabling user zoom
49+
* 4. Remove iOS text size adjust without disabling user zoom
4750
* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
4851
*/
4952

5053
html {
51-
overflow-y: scroll; /* 1 */
52-
-webkit-tap-highlight-color: rgba(0,0,0,0); /* 2 */
53-
-webkit-text-size-adjust: 100%; /* 3 */
54-
-ms-text-size-adjust: 100%;
54+
font-size: 100%; /* 1 */
55+
overflow-y: scroll; /* 2 */
56+
-webkit-tap-highlight-color: rgba(0,0,0,0); /* 3 */
57+
-webkit-text-size-adjust: 100%; /* 4 */
58+
-ms-text-size-adjust: 100%; /* 4 */
5559
}
5660

5761
/*
58-
* 1. Define the base font-size (using % or em will retain text resizing in IE6/7)
59-
* 2. Define the base line-height.
60-
* 3. Remove margin
62+
* Remove margin
63+
* Addresses margins handled incorrectly in IE6/7
6164
*/
6265

6366
body {
64-
font-size: 100%; /* 1 */
65-
line-height: normal; /* 2 */
66-
margin: 0; /* 3 */
67+
margin: 0;
6768
}
6869

6970
/*
@@ -72,10 +73,10 @@ body {
7273
*/
7374

7475
body,
76+
button,
7577
input,
76-
button,
77-
textarea,
78-
select {
78+
select,
79+
textarea {
7980
font-family: sans-serif;
8081
}
8182

0 commit comments

Comments
 (0)