aboutsummaryrefslogtreecommitdiff
path: root/lib/reset.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-08-17 22:26:25 -0700
committerMark Otto <[email protected]>2011-08-17 22:26:25 -0700
commit68007404a87e5f40de85896f6d935fde469a032c (patch)
treefe3ef581e30132af1f9a302118443fca71b10a3c /lib/reset.less
parent5c687ee393945762403bbea8e7e86a618e474ac6 (diff)
parent07837a1c47321e97dde4a816cb2cd246724e7481 (diff)
downloadbootstrap-68007404a87e5f40de85896f6d935fde469a032c.tar.xz
bootstrap-68007404a87e5f40de85896f6d935fde469a032c.zip
Merge branch 'master' of http://git.local.twitter.com/bootstrap
Diffstat (limited to 'lib/reset.less')
-rw-r--r--lib/reset.less21
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/reset.less b/lib/reset.less
index 0a3901b4d..db1682202 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,20 +1,21 @@
-/*
- * Reset.less
+/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
- */
+ * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+
+
+// ERIC MEYER RESET
+// ----------------
-// Eric Meyer reset
html, body { margin: 0; padding: 0; }
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
table { border-collapse: collapse; border-spacing: 0; }
ol, ul { list-style: none; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; }
+
// HTML5
-header,
-section,
-footer,
-article,
-aside {
+// -----
+
+header, section, footer, article, aside {
display: block;
-}
+} \ No newline at end of file