From 5214c87c1a6d64721f5c3415a8ac7fa572535b0f Mon Sep 17 00:00:00 2001 From: Karanpharate <43640225+Karanpharate@users.noreply.github.com> Date: Thu, 27 Jun 2019 22:47:23 +0530 Subject: [PATCH 1/3] adds float clear assignment --- assignment1.html | 49 +++++++++++++++++++++ css/assignment1.css | 101 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 assignment1.html create mode 100644 css/assignment1.css diff --git a/assignment1.html b/assignment1.html new file mode 100644 index 0000000..48173d6 --- /dev/null +++ b/assignment1.html @@ -0,0 +1,49 @@ + + + + + + +
+
+
+

HOW IT WORKS

+
+ + + + diff --git a/css/assignment1.css b/css/assignment1.css new file mode 100644 index 0000000..08f0c64 --- /dev/null +++ b/css/assignment1.css @@ -0,0 +1,101 @@ +* { + padding: 0; + margin: 0; +} + +.header { + background-color: #444; +} + +.blankHeader { + width: 140px; + height: 40px; + background-color: #ff8000; + float: left; + margin: 7.5px 150px 7.5px 200px; +} + +.header h4 { + float: left; +} + +.menu { + color: #aaaaaa; + font-size: 18px; + padding: 16px 20px; + font-family: sans-serif; +} + +ul { + list-style: none; +} + +.clearList { + clear: both; + float: none; +} + +.emptyContainer { + width: 100%; + height: 485px; + background-color: #71c4ea; +} + +.dataHeading { + text-align: center; + padding: 66px 36px 70px; + font-family: sans-serif; +} + +.art { + width: 900px; + margin: 0 auto; +} + +.art li { + float: left; + text-align: center; +} + +#clearList { + clear: both; + float: none; +} + +.artContainer { + margin-right: 75px; + width: 140px; + height: 140px; + background-color: #efefef; + border-radius: 50%; + margin-bottom: 15px; +} + +.para { + text-align: center; + width: 140px; + height: 150px; +} + +.footerMenu { + background-color: #ececec; +} + +.footerMenu li { + margin-left: 35%; +} + +.footerMenu h4 { + float: left; +} + +.footer { + font-size: 16px; + font-family: sans-serif; + color: #ff8000; + padding: 15px 10px; +} + +.footerMenu h4:hover { + color: #444444; +} From ca496c7f47e5c33592d0f99033fdf727f37c2f60 Mon Sep 17 00:00:00 2001 From: Karanpharate <43640225+Karanpharate@users.noreply.github.com> Date: Fri, 28 Jun 2019 11:12:47 +0530 Subject: [PATCH 2/3] adds updated assignment --- assignment1.html | 106 ++++++++++++++++------------- css/{assignment1.css => style.css} | 0 2 files changed, 59 insertions(+), 47 deletions(-) rename css/{assignment1.css => style.css} (100%) diff --git a/assignment1.html b/assignment1.html index 48173d6..ec16029 100644 --- a/assignment1.html +++ b/assignment1.html @@ -1,49 +1,61 @@ - - - - - -
-
-
-

HOW IT WORKS

-
- - - + + + + + +
+
+
+

HOW IT WORKS

+
+ + + diff --git a/css/assignment1.css b/css/style.css similarity index 100% rename from css/assignment1.css rename to css/style.css From 64095b0c4c90bedcec25c74d62300242f569ac12 Mon Sep 17 00:00:00 2001 From: Karanpharate <43640225+Karanpharate@users.noreply.github.com> Date: Sat, 29 Jun 2019 23:35:07 +0530 Subject: [PATCH 3/3] adds updated assignment --- assignment1.html | 103 ++++++++++++++++++++++++----------------------- css/style.css | 87 ++++++++++++++++++++------------------- 2 files changed, 99 insertions(+), 91 deletions(-) diff --git a/assignment1.html b/assignment1.html index ec16029..3cabb4e 100644 --- a/assignment1.html +++ b/assignment1.html @@ -3,59 +3,62 @@ - +
+
+ +
+
-
+

HOW IT WORKS

+ +
+
+
- - diff --git a/css/style.css b/css/style.css index 08f0c64..5743f7f 100644 --- a/css/style.css +++ b/css/style.css @@ -3,31 +3,30 @@ margin: 0; } +ul { + list-style: none; +} + .header { background-color: #444; } .blankHeader { width: 140px; - height: 40px; + padding: 17.5px 0; background-color: #ff8000; float: left; - margin: 7.5px 150px 7.5px 200px; + margin: 8px 200px; } -.header h4 { +.header li { float: left; + margin-right: 20px; } -.menu { - color: #aaaaaa; - font-size: 18px; - padding: 16px 20px; - font-family: sans-serif; -} - -ul { - list-style: none; +.header ul { + float: left; + margin-top: 16px; } .clearList { @@ -35,21 +34,34 @@ ul { float: none; } +.menu { + color: #aaaaaa; + font-size: 18px; + font-family: sans-serif; +} + .emptyContainer { - width: 100%; - height: 485px; + padding: 242px 0; background-color: #71c4ea; } .dataHeading { text-align: center; - padding: 66px 36px 70px; + margin: 64px 0 70px 0; font-family: sans-serif; } .art { - width: 900px; - margin: 0 auto; + width: 900px; + margin: 0 auto 110px auto; +} + +.artImageWrap { + padding: 70px 0; + width: 140px; + background-color: #efefef; + border-radius: 50%; + margin: 0 75px 15px 0; } .art li { @@ -57,45 +69,38 @@ ul { text-align: center; } -#clearList { - clear: both; - float: none; -} - -.artContainer { - margin-right: 75px; +.para { width: 140px; - height: 140px; - background-color: #efefef; - border-radius: 50%; - margin-bottom: 15px; } -.para { - text-align: center; - width: 140px; - height: 150px; +.art li.clearList { + float: none; } -.footerMenu { - background-color: #ececec; +.footer { + background-color: #efefef; } -.footerMenu li { - margin-left: 35%; +.footer ul { + width: 400px; + margin: 0 auto; } -.footerMenu h4 { +.footer li { float: left; + margin: 17px 15px 17px 0; } -.footer { +.footer a { + color: #ff8000; font-size: 16px; font-family: sans-serif; - color: #ff8000; - padding: 15px 10px; } -.footerMenu h4:hover { +.footer li.clearList { + float: none; +} + +.footer a:hover { color: #444444; }