From 608c8fe94856b83853a54d89a28689c5f39c37a7 Mon Sep 17 00:00:00 2001
From: uneamour <54605953+uneamour@users.noreply.github.com>
Date: Mon, 23 Dec 2019 16:10:37 -0600
Subject: [PATCH 01/10] Updates to .CSS file
Added missing opening and closing curly brackets (see rows 1 and 38)
Added missing hyphens (see row 6)
Added missing colons (see row 21)
Replaced ".element" with "div.feature" (row 35)
Added new groupings (see row 12 and 41)
Added ".header" before h1 tag (see row 20)
---
css/style.css | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/css/style.css b/css/style.css
index 20b5581..6ab5a78 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,22 +1,24 @@
-body
+body { /***Added missing opening curly bracket ***/
font-size: 14px;
}
nav {
- background color: yellow;
- height: 100px;
+ background-color: yellow; /*** Added missing "-" in background-color ***/
margin-top: -10px;
position: fixed;
- width: 100%;
+} /** Added missing curly bracket **/
+ /*** Added new grouping ***/
+ height, width {100px;
+}
section {
margin: 0 auto;
width: 60%;
}
-h1 {
- font-family sans-serif;
+.header /*** Added .header ***/ h1 {
+ font-family: sans-serif; /***Added colon after font-family***/
font-size: 2em;
}
@@ -29,8 +31,12 @@ h3 {
font-size: 1.3em;
}
-.element {
+
+ div.feature { /***replaced ".element" with "div.feature" ***/
background-color: green;
- height: 100px;
margin 10px 0;
- width: 100%;
+} /** Added missing curly bracket **/
+
+ /*** Added new grouping ***/
+ height, width {100px;
+}
From 41382223b6f83f63545349f672795ee9d4fd7d30 Mon Sep 17 00:00:00 2001
From: uneamour <54605953+uneamour@users.noreply.github.com>
Date: Fri, 27 Dec 2019 17:44:33 -0600
Subject: [PATCH 02/10] Create Reset.CSS file
Added Eric Meyers Reset.CSS file to the css-exercise-one repository
---
css/reset.css | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 css/reset.css
diff --git a/css/reset.css b/css/reset.css
new file mode 100644
index 0000000..66dd33a
--- /dev/null
+++ b/css/reset.css
@@ -0,0 +1,24 @@
+}
+/* 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;
+}
From 91fb229730018b922a9dece2e71ba4466dfa4c9d Mon Sep 17 00:00:00 2001
From: uneamour <54605953+uneamour@users.noreply.github.com>
Date: Fri, 27 Dec 2019 18:06:45 -0600
Subject: [PATCH 03/10] Second round of revisions to the Style.CSS file
Added missing opening and closing curly brackets (see rows 1 and 38)
Added missing hyphens (see row 6)
Added ".header" before h1 tag (see row 20)
Added missing colons (see row 21, 27, 36)
Added missing semi-colons (see row 27)
Added new groupings (see row 12 and 41)
Added ".feature, div, and background color" (see rows 43-53)
---
css/style.css | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/css/style.css b/css/style.css
index 6ab5a78..85848ee 100644
--- a/css/style.css
+++ b/css/style.css
@@ -24,19 +24,30 @@ section {
.example, h3 {
padding-top: 30px;
- text-align center
+ text-align: center; /**Added missing colon (:) and and semi-colon **/
}
h3 {
font-size: 1.3em;
}
-
- div.feature { /***replaced ".element" with "div.feature" ***/
+.element {
background-color: green;
- margin 10px 0;
+ margin: 10px 0; /** Added missing colon (:) **/
} /** Added missing curly bracket **/
-
+
/*** Added new grouping ***/
height, width {100px;
}
+
+.feature, div {
+ background-color: blue;
+} /** Added the first of three div elements with background color **/
+
+.feature, div {
+ background-color: blue;
+} /** Added the second of three div elements with background color **/
+
+.feature, div {
+ background-color: blue;
+} /** Added the last of three div elements with background color **/
From f8d6b576e749981c6b3aff2436408c5bda954ecd Mon Sep 17 00:00:00 2001
From: uneamour <54605953+uneamour@users.noreply.github.com>
Date: Sun, 29 Dec 2019 12:02:15 -0600
Subject: [PATCH 04/10] Updated Style.CSS file
Updated the Style.CSS file to now include missing code that resets the margins and padding (see rows 1-19)
---
css/reset.css | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/css/reset.css b/css/reset.css
index 66dd33a..e8ddbc5 100644
--- a/css/reset.css
+++ b/css/reset.css
@@ -1,3 +1,23 @@
+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,
From 157e60444be7bf67ec7df85ac9a9e1ff3adb24e2 Mon Sep 17 00:00:00 2001
From: uneamour <54605953+uneamour@users.noreply.github.com>
Date: Sun, 29 Dec 2019 12:18:36 -0600
Subject: [PATCH 05/10] Third round revision to style.css file
Removed reference to "div" (see row 38)
Removed duplicates of the .feature indicator so that there is only one referenced in the code at the end
Removed independent groupings of height and weight indicators and instead add them to the .nav (see row 9 and 10) and .element (see rows 34 and 35) in the code
---
css/style.css | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/css/style.css b/css/style.css
index 85848ee..acfd0dd 100644
--- a/css/style.css
+++ b/css/style.css
@@ -6,12 +6,10 @@ nav {
background-color: yellow; /*** Added missing "-" in background-color ***/
margin-top: -10px;
position: fixed;
+ height: 100px; /**NEW added height **/
+ width: 100%; /**NEW added width **/
} /** Added missing curly bracket **/
- /*** Added new grouping ***/
- height, width {100px;
-}
-
section {
margin: 0 auto;
width: 60%;
@@ -32,22 +30,11 @@ h3 {
}
.element {
- background-color: green;
- margin: 10px 0; /** Added missing colon (:) **/
+ margin: 10px 0; /** Added missing colon (:) **/
+ height: 100px; /**NEW added height **/
+ width: 100%; /**NEW added width **/
} /** Added missing curly bracket **/
-
- /*** Added new grouping ***/
- height, width {100px;
-}
-.feature, div {
- background-color: blue;
-} /** Added the first of three div elements with background color **/
-
-.feature, div {
- background-color: blue;
-} /** Added the second of three div elements with background color **/
-
-.feature, div {
+.feature {/** NEW Removed reference to div in this code **/
background-color: blue;
-} /** Added the last of three div elements with background color **/
+}
From d0bc04d11de043627422d111f4ab7503d0889746 Mon Sep 17 00:00:00 2001
From: uneamour <54605953+uneamour@users.noreply.github.com>
Date: Tue, 31 Dec 2019 07:03:55 -0600
Subject: [PATCH 06/10] Updated index.css file
Updated index file to modify the last 3 div in the code
---
index.html | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/index.html b/index.html
index 8848434..aad483d 100644
--- a/index.html
+++ b/index.html
@@ -28,15 +28,9 @@ 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.
/**Modified div 1 of 3**/
+ This is text for a div element.
/**Modified div 2 of 3**/
+ This is text for a div element.
/**Modified div 3 of 3**/