From 03a70d531e50b35c23610d7526c40eb6b17d810d Mon Sep 17 00:00:00 2001 From: JamesMurphy45 <67617580+MurphysMods@users.noreply.github.com> Date: Wed, 28 Oct 2020 12:11:52 -0700 Subject: [PATCH 1/3] Linked CSS stylesheet in the index.html --- index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 6fd71e4a1..67804ae0f 100644 --- a/index.html +++ b/index.html @@ -1,16 +1,17 @@ - + - + + Plan your Visit Learn about the Park Get Involved - + "header_img.jpg" Yosemite Park Guide Come explore California’s beautiful wilderness. From 4b94a2a1590128cba8b9bf2c42ecbac6c6063036 Mon Sep 17 00:00:00 2001 From: JamesMurphy45 <67617580+MurphysMods@users.noreply.github.com> Date: Wed, 28 Oct 2020 15:40:18 -0700 Subject: [PATCH 2/3] have completed most MVP items, still have to work on footer image positioning. Plan on finishing tonight --- README.md | 10 ++-- index.css | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 70 +++++++++++++++-------- 3 files changed, 211 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 820e00ab1..d995364b4 100644 --- a/README.md +++ b/README.md @@ -21,11 +21,11 @@ The styles in your [design file](/design/desktop.jpg) include bright colors and Follow these steps to set up and work on your project: -- [ ] Create a forked copy of this project. -- [ ] Clone your OWN version of the repository (Not Lambda's by mistake!). -- [ ] Create a new branch: git checkout -b ``. -- [ ] Implement the project on your newly created `` branch, committing changes regularly. -- [ ] Push commits: git push -u origin ``. +- [ X] Create a forked copy of this project. +- [ X] Clone your OWN version of the repository (Not Lambda's by mistake!). +- [ X] Create a new branch: git checkout -b ``. +- [ X] Implement the project on your newly created `` branch, committing changes regularly. +- [ X] Push commits: git push -u origin ``. ### Task 2: Minimum Viable Product diff --git a/index.css b/index.css index e69de29bb..19e377cc2 100644 --- a/index.css +++ b/index.css @@ -0,0 +1,160 @@ +html, body, div, span, applet, object, iframe, table, caption, tbody, tfoot, thead, tr, th, td, +del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, +dl, dt, dd, ol, ul, li, fieldset, form, label, legend { + vertical-align: baseline; + font-family: inherit; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + outline: 0; + padding: 0; + margin: 0; + border: 0; + } +/* remember to define focus styles! */ +:focus { + outline: 0; + } +body { + background: white; + line-height: 1; + color: black; + } +ol, ul { + list-style: none; + } +/* tables still need cellspacing="0" in the markup */ +table { + border-collapse: separate; + border-spacing: 0; + } +caption, th, td { + font-weight: normal; + text-align: left; + } +/* remove possible quote marks (") from &
*/ +blockquote:before, blockquote:after, q:before, q:after { + content: ""; + } +blockquote, q { + quotes: "" ""; + } +/* Reset code above */ + +*{ + border:3px solid red; /*CLEAR THIS WHEN DONE*/ +} + +nav{ + text-align:center; +} +body{ + width:100%; + /*text-align:center;*/ +} +.planbutton{ + text-decoration: none; + color:white; + display:inline-block; + width:110px; + height:15px; + text-align:center; + padding:2% 0; + border-radius: 10px; + background-color:#FF764E; +} + +.learnbutton{ + text-decoration: none; + color:white; + margin-left:10%; + display:inline-block; + width:110px; + height:15px; + text-align:center; + padding:2% 0; + border-radius: 10px; + background-color:#5ED3EB; +} +.involvedbutton{ + text-decoration: none; + color:white; + margin-left:10%; + display:inline-block; + width:110px; + height:15px; + text-align:center; + padding:2% 0; + border-radius: 10px; + background-color:#FFCD69; +} +header{ + width:100%; +} +.headerimg{ + vertical-align: top; + width: 20%; + display:inline-block; + border-radius: 50%; + padding:5%; + +} +.boldtext{ + font-weight:bold; +} +h1{ + vertical-align: middle; + font-size: 35px; + font-family: 'Chelsea Market', cursive; + display:inline-block; +} + +p{ + vertical-align: middle; + font-family: 'Roboto Mono', monospace; + display:inline-block; +} +.mainimg{ + vertical-align: auto; +} + +.maintext{ + padding-top: 10%; + text-align:center; + vertical-align: middle; + display:inline-block; + width:60%; +} +.mainBodyText{ + text-align:center; + background-color:#DDB9A3; + color:white; +} +.campfireIcon{ + margin-left:45%; + margin-right:50%; + width:10%; + height:10%; +} +.campfireText{ + text-align:center; + margin-left:35%; + margin-right:35%; +} +.rvIcon{ + margin-left:45%; + margin-right:50%; + width:10%; + height:10%; +} + +.rvText{ + text-align:center; + margin-left:35%; + margin-right:35%; +} + +.footerImg{ + +} \ No newline at end of file diff --git a/index.html b/index.html index 67804ae0f..0ad7781d7 100644 --- a/index.html +++ b/index.html @@ -2,37 +2,59 @@ + + - + - Plan your Visit - Learn about the Park - Get Involved - - - "header_img.jpg" - Yosemite Park Guide - Come explore California’s beautiful wilderness. - Always open. Reservations are not available or required to enter the park. - - Not just a great valley, but a shrine to human foresight, the strength of granite, the power of glaciers, the persistence of life, and the tranquility of the High Sierra. - - First protected in 1864, Yosemite National Park is best known for its waterfalls, but within its nearly 1,200 square miles, you can find deep valleys, grand meadows, ancient giant sequoias, a vast wilderness area, and much more. - - "https://image.flaticon.com/icons/svg/2979/2979348.svg" - Fire is a natural and essential part of Yosemite. We manage fire carefully and study how it interacts with the park’s ecosystems. This blog provides updates about fires in Yosemite. Check for current fire restrictions. +
+ + +

+
+ +
- "https://image.flaticon.com/icons/svg/820/820374.svg" - We strongly recommend that you make reservations for lodging, camping, and backpacking. You can pay the park entrance fee upon arrival (there's no need to pay it in advance). - - "footer_img.png" +

Yosemite Park Guide

+

+

Come explore California’s beautiful wilderness.

+

+

Always open. Reservations are not
available or required to enter
the park.

+
+
+
+
+ +

+
+

Not just a great valley, but a shrine to human foresight, the strength of granite, the power of glaciers, the persistence of life, and the tranquility of the High Sierra.

+

+

First protected in 1864, Yosemite National Park is best known for its waterfalls, but within its nearly 1,200 square miles, you can find deep valleys, grand meadows, ancient giant sequoias, a vast wilderness area, and much more.

+
+ +
+ + +

Fire is a natural and essential part of Yosemite. We manage fire carefully and study how it interacts with the park’s ecosystems. This blog provides updates about fires in Yosemite.Check for current fire restrictions.

+
+
+ +

We strongly recommend that you make reservations for lodging, camping, and backpacking. You can pay the park entrance fee upon arrival (there's no need to pay it in advance).

+
+ From f3ab48066fd56432275116c5f4af1118a4f8bee5 Mon Sep 17 00:00:00 2001 From: JamesMurphy45 <67617580+MurphysMods@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:37:04 -0700 Subject: [PATCH 3/3] Finished Project --- index.css | 35 ++++++++++++++++++++++++----------- index.html | 6 ++++-- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/index.css b/index.css index 19e377cc2..2094e5561 100644 --- a/index.css +++ b/index.css @@ -40,10 +40,13 @@ blockquote:before, blockquote:after, q:before, q:after { blockquote, q { quotes: "" ""; } +html{ + font-size:62.5%; +} /* Reset code above */ *{ - border:3px solid red; /*CLEAR THIS WHEN DONE*/ + /*border:2px solid grey; */ /*CLEAR THIS WHEN DONE*/ } nav{ @@ -54,38 +57,39 @@ body{ /*text-align:center;*/ } .planbutton{ + font-family: 'Roboto Mono', monospace; text-decoration: none; color:white; display:inline-block; width:110px; - height:15px; + /*height:15px;*/ text-align:center; - padding:2% 0; + padding:20px; border-radius: 10px; background-color:#FF764E; } .learnbutton{ + width:110px; + font-family: 'Roboto Mono', monospace; text-decoration: none; color:white; margin-left:10%; display:inline-block; - width:110px; - height:15px; text-align:center; - padding:2% 0; + padding:20px; border-radius: 10px; background-color:#5ED3EB; } .involvedbutton{ + width:110px; + font-family: 'Roboto Mono', monospace; text-decoration: none; color:white; margin-left:10%; display:inline-block; - width:110px; - height:15px; text-align:center; - padding:2% 0; + padding:20px; border-radius: 10px; background-color:#FFCD69; } @@ -127,6 +131,9 @@ p{ width:60%; } .mainBodyText{ + padding: 2.5rem; + margin: 0 auto; + width:90%; text-align:center; background-color:#DDB9A3; color:white; @@ -154,7 +161,13 @@ p{ margin-left:35%; margin-right:35%; } +footer{ + text-align:center; + background-color:#F9E7DC; +} .footerImg{ - -} \ No newline at end of file + width:100%; + height:30vh; + overflow:hidden; +} diff --git a/index.html b/index.html index 0ad7781d7..660920773 100644 --- a/index.html +++ b/index.html @@ -38,19 +38,21 @@

Yosemite Park Guide



First protected in 1864, Yosemite National Park is best known for its waterfalls, but within its nearly 1,200 square miles, you can find deep valleys, grand meadows, ancient giant sequoias, a vast wilderness area, and much more.

+

Fire is a natural and essential part of Yosemite. We manage fire carefully and study how it interacts with the park’s ecosystems. This blog provides updates about fires in Yosemite.Check for current fire restrictions.

+

We strongly recommend that you make reservations for lodging, camping, and backpacking. You can pay the park entrance fee upon arrival (there's no need to pay it in advance).

+