diff --git a/css/reset.css b/css/reset.css new file mode 100644 index 0000000..ed11813 --- /dev/null +++ b/css/reset.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/css/style.css b/css/style.css index 20b5581..0b61aa9 100644 --- a/css/style.css +++ b/css/style.css @@ -1,36 +1,38 @@ -body +body { font-size: 14px; } +/* navigation section elements */ nav { - background color: yellow; + background-color: yellow; height: 100px; margin-top: -10px; position: fixed; width: 100%; - - -section { - margin: 0 auto; - width: 60%; } h1 { - font-family sans-serif; + font-family: sans-serif; font-size: 2em; -} - -.example, h3 { padding-top: 30px; - text-align center + text-align: center; } -h3 { +/* main section elements */ +section { + margin: 0 auto; + width: 60%; font-size: 1.3em; } -.element { +div { background-color: green; height: 100px; - margin 10px 0; + margin: 10px 0px; width: 100%; +} + +/* background-color changed for last three div sections */ +div.alternate { + background-color: pink; +} diff --git a/index.html b/index.html index 8848434..6c8e868 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ + @@ -28,13 +29,13 @@

This is text for a div element

This is text for a div element

-
+

This is text for a div element

-
+

This is text for a div element

-
+

This is text for a div element

diff --git a/new_branch_file.txt b/new_branch_file.txt new file mode 100644 index 0000000..e69de29