From 1a1f576a9e158c4a136b899ac9e9cbfc868f33a9 Mon Sep 17 00:00:00 2001 From: Kimberly Motquin Date: Mon, 9 Sep 2019 14:36:40 -0500 Subject: [PATCH 1/8] Create the css/reset.css file --- css/reset.css | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ css/style.css | 48 ++++++++++++++++++++++++++---------------------- index.html | 7 ++++--- 3 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 css/reset.css diff --git a/css/reset.css b/css/reset.css new file mode 100644 index 0000000..af94440 --- /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; +} \ No newline at end of file diff --git a/css/style.css b/css/style.css index 20b5581..98ce8e6 100644 --- a/css/style.css +++ b/css/style.css @@ -1,36 +1,40 @@ -body - font-size: 14px; +body {font-size: 14px; } - -nav { - background color: yellow; - height: 100px; - margin-top: -10px; - position: fixed; - width: 100%; - - -section { - margin: 0 auto; - width: 60%; -} - +/*h1 font definitions*/ h1 { - font-family sans-serif; + font-family: sans-serif; font-size: 2em; } - +/*.example and h3 placement definitions*/ .example, h3 { padding-top: 30px; - text-align center + text-align: center; } - +/*he font definitions*/ h3 { font-size: 1.3em; } - +/*element style definitions*/ .element { background-color: green; height: 100px; - margin 10px 0; + margin: 10px; 0; width: 100%; +} +/*last three div elements in index.html*/ +.element.last { + background-color: blue; +} +/*nav style definitions*/ +nav { + background color: yellow; + height: 100px; + margin-top: -10px; + position: fixed; + width: 100%; +} +/*section definitions*/ +section { + margin: 0; auto; + width: 60%; +} diff --git a/index.html b/index.html index 8848434..574206b 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

From cc19ec0bbf9343cc4f0f5c8abb63b390b0be8918 Mon Sep 17 00:00:00 2001 From: Kimberly Motquin Date: Mon, 9 Sep 2019 14:40:45 -0500 Subject: [PATCH 2/8] first commit --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 574206b..67b91ff 100644 --- a/index.html +++ b/index.html @@ -41,3 +41,4 @@

This is text for a div element

+# css-exercise-one From b0e4eace0bf2266ca9c906fccaff720aa2b6e3fa Mon Sep 17 00:00:00 2001 From: Kimberly Motquin Date: Mon, 9 Sep 2019 14:41:46 -0500 Subject: [PATCH 3/8] second commit --- reset.css | 1 + 1 file changed, 1 insertion(+) create mode 100644 reset.css diff --git a/reset.css b/reset.css new file mode 100644 index 0000000..ef147ba --- /dev/null +++ b/reset.css @@ -0,0 +1 @@ + css-exercise-one From 5157521f2db150bafe5b041096d63e4b6d1cadd2 Mon Sep 17 00:00:00 2001 From: Kimberly Motquin Date: Mon, 9 Sep 2019 14:42:30 -0500 Subject: [PATCH 4/8] third commit --- style.css | 1 + 1 file changed, 1 insertion(+) create mode 100644 style.css diff --git a/style.css b/style.css new file mode 100644 index 0000000..6395897 --- /dev/null +++ b/style.css @@ -0,0 +1 @@ +# css-exercise-one From 818351af850c7ebfdc468d3a21e88fb91b77a6a9 Mon Sep 17 00:00:00 2001 From: kmotquin <51454127+kmotquin@users.noreply.github.com> Date: Mon, 9 Sep 2019 14:48:40 -0500 Subject: [PATCH 5/8] Delete style.css Deleting incorrect file --- style.css | 1 - 1 file changed, 1 deletion(-) delete mode 100644 style.css diff --git a/style.css b/style.css deleted file mode 100644 index 6395897..0000000 --- a/style.css +++ /dev/null @@ -1 +0,0 @@ -# css-exercise-one From ea5593aa66e5f2c3c98fdfa507f117c304bfe44c Mon Sep 17 00:00:00 2001 From: kmotquin <51454127+kmotquin@users.noreply.github.com> Date: Mon, 9 Sep 2019 14:48:47 -0500 Subject: [PATCH 6/8] Delete reset.css Deleting incorrect file --- reset.css | 1 - 1 file changed, 1 deletion(-) delete mode 100644 reset.css diff --git a/reset.css b/reset.css deleted file mode 100644 index ef147ba..0000000 --- a/reset.css +++ /dev/null @@ -1 +0,0 @@ - css-exercise-one From 80c23f52e847aa089be94e7f11af5b3b5a4cfa7e Mon Sep 17 00:00:00 2001 From: kmotquin <51454127+kmotquin@users.noreply.github.com> Date: Wed, 11 Sep 2019 09:17:07 -0500 Subject: [PATCH 7/8] Adding corrected files --- index.html | 86 +++++++++++++++++++++++++++--------------------------- reset.css | 1 + style.css | 1 + 3 files changed, 45 insertions(+), 43 deletions(-) create mode 100644 reset.css create mode 100644 style.css diff --git a/index.html b/index.html index 67b91ff..9ffe66c 100644 --- a/index.html +++ b/index.html @@ -1,44 +1,44 @@ - - - - - - - - - - -
-
-

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

-
-
-

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

+
+
+

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

+
+
+

This is text for a div element

+
+
+

This is text for a div element

+
+
+

This is text for a div element

+
+
+ + # css-exercise-one diff --git a/reset.css b/reset.css new file mode 100644 index 0000000..dc816f6 --- /dev/null +++ b/reset.css @@ -0,0 +1 @@ + css-exercise-one diff --git a/style.css b/style.css new file mode 100644 index 0000000..9037a99 --- /dev/null +++ b/style.css @@ -0,0 +1 @@ +# css-exercise-one From 8ac5ceeb741aa54861533c008acdf272d56831d0 Mon Sep 17 00:00:00 2001 From: kmotquin <51454127+kmotquin@users.noreply.github.com> Date: Wed, 11 Sep 2019 13:56:58 -0500 Subject: [PATCH 8/8] delete style.css - unnecessary file --- style.css | 1 - 1 file changed, 1 deletion(-) delete mode 100644 style.css diff --git a/style.css b/style.css deleted file mode 100644 index 9037a99..0000000 --- a/style.css +++ /dev/null @@ -1 +0,0 @@ -# css-exercise-one