move reset stuff into reset

This commit is contained in:
Adam Bradley
2013-09-18 14:03:02 -05:00
parent af4b6975b0
commit ffdaff4bce
3 changed files with 35 additions and 43 deletions

View File

@ -24,31 +24,24 @@ article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup, figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary, menu, nav, output, ruby, section, summary,
time, mark, audio, video { time, mark, audio, video {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0; border: 0;
font-size: 100%; vertical-align: baseline;
font: inherit; font: inherit;
vertical-align: baseline; font-size: 100%;
} }
body {
line-height: 1;
}
ol, ul { ol, ul {
list-style: none; list-style: none;
} }
blockquote, q { blockquote, q {
quotes: none; quotes: none;
} }
blockquote:before, blockquote:after, blockquote:before, blockquote:after,
q:before, q:after { q:before, q:after {
content: ''; content: '';
content: none; content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
} }
/** /**
@ -85,7 +78,9 @@ script {
*/ */
html { html {
@include user-select(none);
font-family: sans-serif; /* 1 */ font-family: sans-serif; /* 1 */
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%; /* 2 */ -ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */
} }
@ -96,9 +91,18 @@ html {
body { body {
margin: 0; margin: 0;
line-height: 1;
} }
/* *
* Remove tap highlight color on Safari
*/
a {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
/** /**
* Address `outline` inconsistency between Chrome and other browsers. * Address `outline` inconsistency between Chrome and other browsers.
*/ */
@ -157,8 +161,8 @@ code,
kbd, kbd,
pre, pre,
samp { samp {
font-family: monospace, serif;
font-size: 1em; font-size: 1em;
font-family: monospace, serif;
} }
/** /**
@ -191,10 +195,10 @@ small {
sub, sub,
sup { sup {
font-size: 75%;
line-height: 0;
position: relative; position: relative;
vertical-align: baseline; vertical-align: baseline;
font-size: 75%;
line-height: 0;
} }
sup { sup {
@ -210,9 +214,9 @@ sub {
*/ */
fieldset { fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px; margin: 0 2px;
padding: 0.35em 0.625em 0.75em; padding: 0.35em 0.625em 0.75em;
border: 1px solid #c0c0c0;
} }
/** /**
@ -221,8 +225,8 @@ fieldset {
*/ */
legend { legend {
border: 0; /* 1 */
padding: 0; /* 2 */ padding: 0; /* 2 */
border: 0; /* 1 */
} }
/** /**
@ -235,9 +239,9 @@ button,
input, input,
select, select,
textarea { textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 2 */
margin: 0; /* 3 */ margin: 0; /* 3 */
font-size: 100%; /* 2 */
font-family: inherit; /* 1 */
} }
/** /**
@ -274,8 +278,8 @@ button,
html input[type="button"], /* 1 */ html input[type="button"], /* 1 */
input[type="reset"], input[type="reset"],
input[type="submit"] { input[type="submit"] {
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */ cursor: pointer; /* 3 */
-webkit-appearance: button; /* 2 */
} }
/** /**
@ -294,10 +298,10 @@ html input[disabled] {
*/ */
input[type="search"] { input[type="search"] {
-webkit-appearance: textfield; /* 1 */
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* 2 */ -webkit-box-sizing: content-box; /* 2 */
-moz-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
-webkit-appearance: textfield; /* 1 */
} }
/** /**
@ -316,8 +320,8 @@ input[type="search"]::-webkit-search-decoration {
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { input::-moz-focus-inner {
border: 0;
padding: 0; padding: 0;
border: 0;
} }
/** /**
@ -339,6 +343,6 @@ textarea {
*/ */
table { table {
border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
border-collapse: collapse;
} }

View File

@ -1,10 +1,3 @@
// TODO: This might be inefficient?
// Make sure iOS Safari doesn't scale fonts on orientation changes
html {
@include user-select(none);
-webkit-text-size-adjust: 100%;
}
body { body {
position: fixed; position: fixed;
@ -16,9 +9,9 @@ body {
margin: 0; margin: 0;
padding: 0; padding: 0;
word-wrap: break-word; word-wrap: break-word;
font-size: 14px; font-size: $font-size-base;
font-family: $base-font-family; font-family: $base-font-family;
line-height: 1.25; line-height: $line-height-computed;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;

View File

@ -16,11 +16,6 @@ p {
line-height: 1.4; line-height: 1.4;
} }
// Remove tap highlight color on Safari
a {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
// Emphasis & misc // Emphasis & misc
// ------------------------- // -------------------------