From a2db51725c04499d54930b8dde5e0fa772acc349 Mon Sep 17 00:00:00 2001 From: SherllinT <161366148+SherllinT@users.noreply.github.com> Date: Tue, 27 Feb 2024 16:28:57 -0500 Subject: [PATCH 1/6] Create readme.html --- lesson_01/readme.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 lesson_01/readme.html diff --git a/lesson_01/readme.html b/lesson_01/readme.html new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/lesson_01/readme.html @@ -0,0 +1 @@ + From 110757688536ffb13c9727a78726bf2dce15cc42 Mon Sep 17 00:00:00 2001 From: SherllinT Date: Tue, 16 Apr 2024 14:18:51 +0000 Subject: [PATCH 2/6] feat: committing my changes thus far --- lesson_20/template/style.css | 77 ++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/lesson_20/template/style.css b/lesson_20/template/style.css index e69de29bb..7495028a6 100644 --- a/lesson_20/template/style.css +++ b/lesson_20/template/style.css @@ -0,0 +1,77 @@ +html body{ + margin:0; + font-family: Poppins, sans-serif; + background-color: white; + + } + img[src="logo.png"]{ + width: 250px; + float:left; + margin-top: 10px; + margin-left: 25px; + } + + @media (max-width: 680px){ + img[src="logo.png"]{ + width: 100px; + + + } + } + + + .header-top-menu{ + list-style: none; + display:flex; + flex:1; + gap: 40px; + padding-left: 100px; + color: black; + } + + + .hero-text { + background-color: #243e90; + height: 125px; + color: white; + float: left; + margin-right: 450px; + margin-top: 100px; + text-align:justify; + font-size: 20px; + display: block; + padding-top: 20px; + } + + .hero-section { + background-image: url(./hero.jpg); + height: 500px; + width: 100%; + display: block; + background-attachment: fixed; + background-position: center; + background-repeat: no-repeat; + background-size: cover; + } + + + .hero-title { + + text-align: center; + color: white; + font-size: 3rem; + } + + .highlight{ + text-decoration: underline; + text-decoration-color:#f47d26; + text-decoration-thickness: 10px; + } + .highlight:hover{ + --underline-width: 100%; + + } + + span { + color: #f47d26; + } \ No newline at end of file From eabcdb361f0773f5d3d359a4c926b90bf3bfe865 Mon Sep 17 00:00:00 2001 From: SherllinT Date: Wed, 17 Apr 2024 03:02:46 +0000 Subject: [PATCH 3/6] feat: updated header and background --- lesson_20/template/style.css | 128 ++++++++++++++++++++++++++++------- 1 file changed, 102 insertions(+), 26 deletions(-) diff --git a/lesson_20/template/style.css b/lesson_20/template/style.css index 7495028a6..8f013d848 100644 --- a/lesson_20/template/style.css +++ b/lesson_20/template/style.css @@ -1,17 +1,27 @@ +*{ + box-sizing: border-box; +} + html body{ margin:0; + padding: 0; font-family: Poppins, sans-serif; + vertical-align: baseline; background-color: white; - + position: relative; + } img[src="logo.png"]{ - width: 250px; - float:left; - margin-top: 10px; - margin-left: 25px; + width: 226.635px; + height: 75px; + display: block; + position:left; + margin-top: 25px; + margin-bottom: 25px; + } - @media (max-width: 680px){ + @media (max-width: 690px){ img[src="logo.png"]{ width: 100px; @@ -19,47 +29,100 @@ html body{ } } + .header{ + display: flex; + background-color: white; + padding: 0 18px; + margin: 0; + position: sticky; + top: 0; + width: 100%; + z-index: 999; + + } + + + .header-cta{ + height: 37px; + width: 105.97px; + border-radius: 10px; + background-color:#f47d26; + margin-top: 45px; + margin-right: 100px; + text-align: center; + } + .header-top-menu{ list-style: none; display:flex; + font-size: 16px; + font-weight: 600; flex:1; gap: 40px; - padding-left: 100px; - color: black; + margin-top: 50px; + + + } + .header-top-menu a{ + color: #3c3c3c; + font-size: 16px; } + .programs-section h2{ + font-family: Montserrat; + font-weight: 900; + color: #444; + letter-spacing: 0; + -webkit-font-smoothing: antialiased; + font-size: 34px; + line-height: 44px; + margin-bottom: 7px; + padding-top: 50px; + padding-left: 70px; + } .hero-text { background-color: #243e90; - height: 125px; color: white; - float: left; - margin-right: 450px; - margin-top: 100px; - text-align:justify; - font-size: 20px; - display: block; - padding-top: 20px; + font-family: Poppins; + -webkit-font-smoothing: antialiased; + font-size: 18px; + font-weight: 400; + height: 125px; + margin-right: 475px; + padding-right: 50px; + padding-left: 147px; + margin-top: 150px; + padding-top: 25px; + vertical-align: baseline; } .hero-section { - background-image: url(./hero.jpg); - height: 500px; + background-image:linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .5)), url(./hero.jpg); + height: 600px; width: 100%; - display: block; background-attachment: fixed; - background-position: center; + background-attachment: scroll; background-repeat: no-repeat; background-size: cover; - } - + margin-top: -25px; + } + + .hero-title { - - text-align: center; color: white; - font-size: 3rem; + padding-left: 144px; + width: 70%; + height: 124px; + font-family: Montserrat; + font-weight: 800; + font-size: 54px; + line-height: 62px; + padding-top: 150px; + margin-bottom: 7px; + box-sizing: border-box; } .highlight{ @@ -74,4 +137,17 @@ html body{ span { color: #f47d26; - } \ No newline at end of file + } + +.programs { + display:flex; + flex-direction: row; + width: 50%; + text-align:start; + list-style: none; + +} + +.footer{ + text-align: center; +} \ No newline at end of file From 5fa93fce281fc22d09e68cb6d1a579ccc5ff77f2 Mon Sep 17 00:00:00 2001 From: SherllinT Date: Wed, 17 Apr 2024 04:54:44 +0000 Subject: [PATCH 4/6] feat: installed and ran prettier command to format css code --- lesson_20/template/style.css | 246 +++++++++++++++++------------------ 1 file changed, 119 insertions(+), 127 deletions(-) diff --git a/lesson_20/template/style.css b/lesson_20/template/style.css index 8f013d848..c6d3c42eb 100644 --- a/lesson_20/template/style.css +++ b/lesson_20/template/style.css @@ -1,75 +1,68 @@ -*{ - box-sizing: border-box; -} - -html body{ - margin:0; +* { + box-sizing: border-box; + } + + html body { + margin: 0; padding: 0; font-family: Poppins, sans-serif; vertical-align: baseline; background-color: white; position: relative; - + } + img[src="logo.png"] { + width: 226.635px; + height: 75px; + display: block; + position: left; + margin-top: 25px; + margin-bottom: 25px; + } + + @media (max-width: 690px) { + img[src="logo.png"] { + width: 100px; } - img[src="logo.png"]{ - width: 226.635px; - height: 75px; - display: block; - position:left; - margin-top: 25px; - margin-bottom: 25px; - - } - - @media (max-width: 690px){ - img[src="logo.png"]{ - width: 100px; - - - } - } - - .header{ - display: flex; - background-color: white; - padding: 0 18px; - margin: 0; - position: sticky; - top: 0; - width: 100%; - z-index: 999; - - - } - - - .header-cta{ + } + + .header { + display: flex; + background-color: white; + padding: 0 18px; + margin: 0; + position: sticky; + top: 0; + width: 100%; + z-index: 999; + width: 100%; + } + + .header-cta { height: 37px; width: 105.97px; - border-radius: 10px; - background-color:#f47d26; - margin-top: 45px; - margin-right: 100px; - text-align: center; - } - - .header-top-menu{ - list-style: none; - display:flex; - font-size: 16px; - font-weight: 600; - flex:1; - gap: 40px; - margin-top: 50px; - - - } - .header-top-menu a{ - color: #3c3c3c; - font-size: 16px; - } - - .programs-section h2{ + border-radius: 10px; + background-color: #f47d26; + margin-top: 45px; + margin-right: 100px; + text-align: center; + } + + .header-top-menu { + list-style: none; + display: flex; + font-size: 16px; + font-weight: 600; + flex: 1; + gap: 40px; + margin-top: 50px; + } + .header-top-menu a { + color: #3c3c3c; + font-size: 16px; + text-decoration: none; + } + + .programs-section h2 { font-family: Montserrat; font-weight: 900; color: #444; @@ -80,74 +73,73 @@ html body{ margin-bottom: 7px; padding-top: 50px; padding-left: 70px; - } - - .hero-text { - background-color: #243e90; - color: white; - font-family: Poppins; - -webkit-font-smoothing: antialiased; - font-size: 18px; - font-weight: 400; - height: 125px; - margin-right: 475px; - padding-right: 50px; - padding-left: 147px; - margin-top: 150px; - padding-top: 25px; - vertical-align: baseline; - } - - .hero-section { - background-image:linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .5)), url(./hero.jpg); + } + + .hero-text { + background-color: #243e90; + color: white; + font-family: Poppins; + -webkit-font-smoothing: antialiased; + font-size: 18px; + font-weight: 400; + height: 125px; + margin-right: 475px; + padding-right: 50px; + padding-left: 147px; + margin-top: 150px; + padding-top: 25px; + vertical-align: baseline; + } + + .hero-section { + background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), + url(./hero.jpg); height: 600px; width: 100%; background-attachment: fixed; background-attachment: scroll; background-repeat: no-repeat; background-size: cover; - margin-top: -25px; - } - - - - .hero-title { - color: white; - padding-left: 144px; - width: 70%; - height: 124px; - font-family: Montserrat; - font-weight: 800; - font-size: 54px; - line-height: 62px; - padding-top: 150px; - margin-bottom: 7px; - box-sizing: border-box; - } - - .highlight{ - text-decoration: underline; - text-decoration-color:#f47d26; - text-decoration-thickness: 10px; - } - .highlight:hover{ - --underline-width: 100%; - - } - - span { - color: #f47d26; - } - -.programs { - display:flex; - flex-direction: row; - width: 50%; - text-align:start; + margin-top: -25px; + } + + .hero-title { + color: white; + padding-left: 144px; + width: 70%; + height: 124px; + font-family: Montserrat; + font-weight: 800; + font-size: 54px; + line-height: 62px; + padding-top: 150px; + margin-bottom: 7px; + box-sizing: border-box; + } + + .highlight { + text-decoration: underline; + text-decoration-color: #f47d26; + text-decoration-thickness: 10px; + } + .highlight:hover { + --underline-width: 100%; + } + + span { + color: #f47d26; + } + + .program { + display: flex; + gap: 10px; + flex-direction: column; + flex-wrap: nowrap; + justify-content: start; list-style: none; - -} - -.footer{ + width: 50%; + } + + .footer { text-align: center; -} \ No newline at end of file + } \ No newline at end of file From 066d435e8ff7541c8de0bae7a2282e93770ef921 Mon Sep 17 00:00:00 2001 From: SherllinT Date: Wed, 17 Apr 2024 16:37:47 +0000 Subject: [PATCH 5/6] feat: adds css to CD website --- lesson_20/template/style.css | 169 ++++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 63 deletions(-) diff --git a/lesson_20/template/style.css b/lesson_20/template/style.css index c6d3c42eb..42116c36c 100644 --- a/lesson_20/template/style.css +++ b/lesson_20/template/style.css @@ -2,14 +2,28 @@ box-sizing: border-box; } - html body { + html, body { margin: 0; padding: 0; font-family: Poppins, sans-serif; - vertical-align: baseline; - background-color: white; - position: relative; + font-size: 18px; + font-weight: 400; + color: rgb(103, 103, 103); + } + + a { + text-decoration: none; + color: black; + } + + p { -webkit-font-smoothing: antialiased; + + } + body{ + display: flex; + flex-direction: column; } + img[src="logo.png"] { width: 226.635px; height: 75px; @@ -27,80 +41,62 @@ .header { display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; background-color: white; padding: 0 18px; - margin: 0; position: sticky; top: 0; width: 100%; z-index: 999; - width: 100%; + box-shadow: 0 0 14px 0 #a0a0a0; } - .header-cta { + .header-top-menu { + list-style: none; + display: flex; + align-items: center; + font-size: 16px; + font-weight: 600; + flex: 1; + gap: 32px; + } + + .header-top-menu li{ + border-bottom: 2px solid transparent; + } + + .header-top-menu li:hover { +border-bottom: 2px solid #f47d26 ; + } + + .sign-up-button { + color:white; height: 37px; width: 105.97px; border-radius: 10px; + padding: 5px 20px; background-color: #f47d26; - margin-top: 45px; margin-right: 100px; text-align: center; } - .header-top-menu { - list-style: none; - display: flex; - font-size: 16px; - font-weight: 600; - flex: 1; - gap: 40px; - margin-top: 50px; - } .header-top-menu a { color: #3c3c3c; font-size: 16px; text-decoration: none; - } - - .programs-section h2 { - font-family: Montserrat; - font-weight: 900; - color: #444; - letter-spacing: 0; - -webkit-font-smoothing: antialiased; - font-size: 34px; - line-height: 44px; - margin-bottom: 7px; - padding-top: 50px; - padding-left: 70px; - } - - .hero-text { - background-color: #243e90; - color: white; - font-family: Poppins; - -webkit-font-smoothing: antialiased; - font-size: 18px; - font-weight: 400; - height: 125px; - margin-right: 475px; - padding-right: 50px; - padding-left: 147px; - margin-top: 150px; - padding-top: 25px; - vertical-align: baseline; - } - + } .hero-section { - background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), + background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.2)), url(./hero.jpg); height: 600px; - width: 100%; + width: 100vw; background-attachment: fixed; background-attachment: scroll; background-repeat: no-repeat; background-size: cover; - margin-top: -25px; + margin-top: -45px; } .hero-title { @@ -108,7 +104,6 @@ padding-left: 144px; width: 70%; height: 124px; - font-family: Montserrat; font-weight: 800; font-size: 54px; line-height: 62px; @@ -116,18 +111,59 @@ margin-bottom: 7px; box-sizing: border-box; } + + .hero-text { + background-color: #243e90; + color: white; + font-size: 18px; + height: 125px; + margin-right: 475px; + padding-right: 50px; + padding-left: 147px; + margin-top: 150px; + padding-top: 25px; + vertical-align: baseline; + } - .highlight { - text-decoration: underline; - text-decoration-color: #f47d26; - text-decoration-thickness: 10px; +em.highlight { + position: relative; + display: inline-block; + font-size: normal; + padding: 0 3px; + z-index: 1; + font-style: normal; + font-weight: 400px; +} + em.highlight:before{ + display: block; + position: absolute; + content: ""; + height: 25%; + top: auto; + bottom:5px; + width: 100%; + background-color: #f47d26; + z-index: -1; + left: 0; + right:0 ; } - .highlight:hover { - --underline-width: 100%; + + .programs-section h2 { + font-weight: 900; + color: #444; + letter-spacing: 0; + font-size: 34px; + line-height: 44px; + margin-bottom: 7px; + padding-top: 50px; + padding-left: 70px; } - - span { - color: #f47d26; + + + .programs{ + display: flex; + flex-direction: row; + flex-wrap: wrap; } .program { @@ -135,11 +171,18 @@ gap: 10px; flex-direction: column; flex-wrap: nowrap; - justify-content: start; list-style: none; - width: 50%; + width: 48%; + text-align: left; + line-height: 24px; + margin: auto; + } .footer { text-align: center; + flex-direction: column; + padding: 45px 0 70px 0; + font-size: .8em; + box-shadow: inset 0 5px 12px 4px #e5e5e5; } \ No newline at end of file From 951900cb266c7a78808381bd44ccc26d41bfaad9 Mon Sep 17 00:00:00 2001 From: SherllinT Date: Wed, 17 Apr 2024 16:45:45 +0000 Subject: [PATCH 6/6] feat: updated programs font color --- lesson_20/template/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lesson_20/template/style.css b/lesson_20/template/style.css index 42116c36c..92d3132da 100644 --- a/lesson_20/template/style.css +++ b/lesson_20/template/style.css @@ -178,6 +178,13 @@ em.highlight { margin: auto; } + + .program h3 { + color: #444; + font-size: 22px; + font-family: Montserrat; + font-weight: 700; + } .footer { text-align: center;