From 0dc70c380371ce565169d35d1465fe0725c6bc92 Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 18:07:30 -0500 Subject: [PATCH 1/9] added basic html tags --- README.md | 10 +++---- index.html | 84 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 58 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 820e00ab1..b1b1bcc29 100644 --- a/README.md +++ b/README.md @@ -31,18 +31,18 @@ Follow these steps to set up and work on your project: Once your repository is set up, practice what you learned today to style the site according to the given design. Your complete project should look similar to the desktop image. You should take the following actions, at a minimum: -- [ ] Link your CSS stylesheet in the `index.html` and impliment a CSS reset +- [x] Link your CSS stylesheet in the `index.html` and impliment a CSS reset - [ ] Markup html semantically, such that it can be styled according to the given desktop image - [ ] Color the background of items in the navigation bar and footer with the following colors: - - [ ] Plan your Visit: `#FF764E` - - [ ] Learn About the Park: `#5ED3EB` - - [ ] Get Involved: `#FFCD69` +- [ ] Plan your Visit: `#FF764E` +- [ ] Learn About the Park: `#5ED3EB` +- [ ] Get Involved: `#FFCD69` - [ ] Change all font colors and styles according to design file - [ ] Yosemite Park Guide font is called Chelsea Market and can be found on [google fonts](https://fonts.google.com/specimen/Chelsea+Market) - [ ] All other text is Roboto Mono, also available on [google fonts](https://fonts.google.com/specimen/Roboto+Mono) - [ ] Color the background of the main text body with `#DDB9A3` - [ ] Color the background of the footer with `#F9E7DC` -- [ ] Bold the words "current fire restrictions" and "park entrance fee" according to the design file +- [x] Bold the words "current fire restrictions" and "park entrance fee" according to the design file - [ ] Apply box model properties (content, padding, margin, and border) to all content such that your webpage matches the design file. This will include at least: - [ ] A round image in the header - [ ] Round corners on navigation and footer items diff --git a/index.html b/index.html index 6fd71e4a1..443244078 100644 --- a/index.html +++ b/index.html @@ -1,37 +1,59 @@ - - - - - - Plan your Visit - Learn about the Park - Get Involved - - - "header_img.jpg" - Yosemite Park Guide - Come explore California’s beautiful wilderness. + + + + + + + Tunnel view at Yosemite Park +

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). +

+ +

+ 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. +

+ + + cartoon of a camp fire +

+ 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. +

+ + cartoon of a trailer +

+ 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). +

+ landscape view of Yosemite from iconic Glacier Point - "footer_img.png" - - - Plan your Visit - Learn about the Park - Get Involved - - +

Plan your Visit

+

Learn about the Park

+

Get Involved

+ From df29a93b970681826f61507899510c13a9965f7c Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 18:50:57 -0500 Subject: [PATCH 2/9] assign classes --- README.md | 8 ++--- index.html | 99 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 62 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index b1b1bcc29..2c8bf8fca 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ 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. +- [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. - [ ] Push commits: git push -u origin ``. ### Task 2: Minimum Viable Product diff --git a/index.html b/index.html index 443244078..82177ff09 100644 --- a/index.html +++ b/index.html @@ -6,54 +6,71 @@ +
+
+ Tunnel view at Yosemite Park +
+
+

Yosemite Park Guide

+

Come explore California’s beautiful wilderness.

+

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

+
+
- Tunnel view at Yosemite Park -

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. -

+
+

+ 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. +

+
+ +
+
+ cartoon of a camp fire

- 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.

+
+ +
+ cartoon of a trailer +

+ 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). +

+
+
- cartoon of a camp fire -

- 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. -

+
+
+ landscape view of Yosemite from iconic Glacier Point +
+
+ Plan your Visit + Learn about the Park + Get Involved +
- cartoon of a trailer -

- 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). -

- landscape view of Yosemite from iconic Glacier Point +
-

Plan your Visit

-

Learn about the Park

-

Get Involved

From 5cc0c7349638359d660c63ff49aa1c68d45bc367 Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 19:02:30 -0500 Subject: [PATCH 3/9] started CSS reset --- index.css | 12 ++++++++++ index.html | 68 +++++++++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 31 deletions(-) diff --git a/index.css b/index.css index e69de29bb..9c98e7736 100644 --- a/index.css +++ b/index.css @@ -0,0 +1,12 @@ +html { + font-size: 62.5%; +} + +body { + font-family: ; + font-size: 1.6 rem; +} + +section { + padding: 4% 0; +} \ No newline at end of file diff --git a/index.html b/index.html index 82177ff09..7b0f2f8b8 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,3 @@ - @@ -26,8 +25,8 @@

Yosemite Park Guide

- 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 + 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.

@@ -37,40 +36,47 @@

Yosemite Park Guide

and much more.

- -
-
- cartoon of a camp fire -

- 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. -

-
- -
- cartoon of a trailer -

- 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). -

+ +
+
+ cartoon of a camp fire +

+ 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. +

+
+ cartoon of a trailer +

+ 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). +

+
- +
-
- landscape view of Yosemite from iconic Glacier Point +
+ landscape view of Yosemite from iconic Glacier Point
-
- Plan your Visit - Learn about the Park - Get Involved +
+ Plan your Visit + Learn about the Park + Get Involved
-
- From dbb712c90513a88d65ba201ab8ed5c6b5048ea8d Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 19:25:46 -0500 Subject: [PATCH 4/9] finish CSS reset and uploaded customize font --- index.css | 6 ++++-- index.html | 15 ++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/index.css b/index.css index 9c98e7736..a3091fa47 100644 --- a/index.css +++ b/index.css @@ -1,10 +1,12 @@ +/* CSS reset */ + html { font-size: 62.5%; } body { - font-family: ; - font-size: 1.6 rem; + font-family: 'Roboto Mono', monospace; + font-size: 2rem; } section { diff --git a/index.html b/index.html index 7b0f2f8b8..da718975a 100644 --- a/index.html +++ b/index.html @@ -1,20 +1,21 @@ +
Tunnel view at Yosemite Park
-

Yosemite Park Guide

+

Yosemite Park Guide

Come explore California’s beautiful wilderness.

Always open. Reservations are not available or required to enter the @@ -73,9 +74,9 @@

Yosemite Park Guide

/>
- Plan your Visit - Learn about the Park - Get Involved +

Plan your Visit

+

Learn about the Park

+

Get Involved

From 1873eb31edf095f525083c86181d06b4f81f9588 Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 21:20:10 -0500 Subject: [PATCH 5/9] update CSS tabs at the top --- index.css | 24 ++++++++++++++++++++---- index.html | 6 +++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/index.css b/index.css index a3091fa47..4515baaef 100644 --- a/index.css +++ b/index.css @@ -6,9 +6,25 @@ html { body { font-family: 'Roboto Mono', monospace; - font-size: 2rem; + font-size: 1.6rem; + max-width: 100%; +} +/* tab blocks at the top */ + +nav { + border: 2px solid black; + padding: 0 10%; +} + +/* tab blocks */ +nav .tab { + color: red; + display: inline-block; + text-align: center; + border-radius: 30px; + border: 1px solid red; + width: 30%; + box-sizing: border-box; + padding: 0 10%; } -section { - padding: 4% 0; -} \ No newline at end of file diff --git a/index.html b/index.html index da718975a..d0a6ed8a3 100644 --- a/index.html +++ b/index.html @@ -74,9 +74,9 @@

Yosemite Park Guide

/>
-

Plan your Visit

-

Learn about the Park

-

Get Involved

+

Plan your Visit

+

Learn about the Park

+

Get Involved

From 9426c9901e6ed2c827330fe4ef0df1dc592e6da6 Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 21:43:50 -0500 Subject: [PATCH 6/9] reconsidered cascade --- index.css | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/index.css b/index.css index 4515baaef..f4f9035f1 100644 --- a/index.css +++ b/index.css @@ -9,22 +9,41 @@ body { font-size: 1.6rem; max-width: 100%; } -/* tab blocks at the top */ - -nav { - border: 2px solid black; - padding: 0 10%; -} - /* tab blocks */ -nav .tab { - color: red; +.tab { display: inline-block; text-align: center; border-radius: 30px; - border: 1px solid red; - width: 30%; + width: 30%; + box-sizing: border-box; +} + +.plan { + background-color: #FF764E; + color: white; +} + +.learn { + background-color: #5ED3EB; + color: white; +} + +.get { + background-color: #FFCD69; + color: white; +} +/* tab blocks on top */ + +nav { + border: 1px red solid; box-sizing: border-box; - padding: 0 10%; + padding: 0 auto; } +/* header */ + +header { + display: inline-block; + width: 40%; +} + From 0aad7068df1de1151ae6f209da139f0e0e7fb422 Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 22:23:38 -0500 Subject: [PATCH 7/9] setting up main text area --- index.css | 26 ++++++++++++++++++++++++-- index.html | 12 ++++++------ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/index.css b/index.css index f4f9035f1..c06f0a17d 100644 --- a/index.css +++ b/index.css @@ -37,13 +37,35 @@ body { nav { border: 1px red solid; box-sizing: border-box; - padding: 0 auto; } + /* header */ header { +display: inline-block; +border: 1px solid black; +} + +header #circle { + width: 20%; + border-radius: 50%; + border: 1px red solid; +} + +.header-title { display: inline-block; - width: 40%; + width: 20%; + border: 1px red solid; +} + +/* header specifics */ +header #yosemite-title { + font-family: 'Chelsea Market', cursive; } +/* block of text */ +.main-text { + background: #DDB9A3; + color: white; +} diff --git a/index.html b/index.html index d0a6ed8a3..9471063f1 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,7 @@ + @@ -10,10 +11,9 @@

Learn about the Park

Get Involved

+
-
- Tunnel view at Yosemite Park -
+ Tunnel view at Yosemite Park

Yosemite Park Guide

Come explore California’s beautiful wilderness.

@@ -24,7 +24,7 @@

Yosemite Park Guide

-
+

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 @@ -74,8 +74,8 @@

Yosemite Park Guide

/>
-

Plan your Visit

-

Learn about the Park

+

Plan your Visit

+

Learn about the Park

Get Involved

From d595efa5546b2d2be8dde749eca37eb3d6f2646b Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 22:56:55 -0500 Subject: [PATCH 8/9] something that resembles the product --- index.css | 37 +++++++++++++++++++++++++++++++++++-- index.html | 2 ++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/index.css b/index.css index c06f0a17d..21314e488 100644 --- a/index.css +++ b/index.css @@ -1,5 +1,3 @@ -/* CSS reset */ - html { font-size: 62.5%; } @@ -9,6 +7,9 @@ body { font-size: 1.6rem; max-width: 100%; } + +/* CSS reset */ + /* tab blocks */ .tab { display: inline-block; @@ -68,4 +69,36 @@ header #yosemite-title { .main-text { background: #DDB9A3; color: white; + margin: 0 auto; +} + +#campfire { + width: 10%; +} + +/* info-blocks with icons */ +.info-block-fire { + border: 1px red solid; + text-align: center; + padding: 0 40%; } + +#trailer { + width: 10%; +} +.info-block-trailer { + border: 1px red solid; + text-align: center; + padding: 0 40%; +} + +/* footer */ + +footer { + background-color: #F9E7DC; + display: inline-block; +} + +#tunnel-view { + max-width: 100%; +} \ No newline at end of file diff --git a/index.html b/index.html index 9471063f1..309373bdf 100644 --- a/index.html +++ b/index.html @@ -43,6 +43,7 @@

Yosemite Park Guide

cartoon of a camp fire

Fire is a natural and essential part of Yosemite. We manage fire @@ -54,6 +55,7 @@

Yosemite Park Guide

cartoon of a trailer From d4f430cd97a77e2c13452a9c3380cf2bdf656fba Mon Sep 17 00:00:00 2001 From: Michelle Chen Date: Wed, 28 Oct 2020 23:18:18 -0500 Subject: [PATCH 9/9] Set up close to the final product. Need revision. --- index.css | 10 ++++++---- index.html | 7 +------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/index.css b/index.css index 21314e488..54fa5aa7d 100644 --- a/index.css +++ b/index.css @@ -95,10 +95,12 @@ header #yosemite-title { /* footer */ footer { + border: 1px red solid; background-color: #F9E7DC; - display: inline-block; + max-width: 100%; } -#tunnel-view { - max-width: 100%; -} \ No newline at end of file +.bottom-picture { + width: 100%; + height: 60vh; +} diff --git a/index.html b/index.html index 309373bdf..db4b8eff1 100644 --- a/index.html +++ b/index.html @@ -69,12 +69,7 @@

Yosemite Park Guide