From ce488a5798b4491df265ab1c77803aed0c0c9398 Mon Sep 17 00:00:00 2001 From: vietanhdtd <35613053+vietanhdtd@users.noreply.github.com> Date: Fri, 10 May 2019 13:33:25 +0700 Subject: [PATCH 1/5] updated README.md add VY as a DEV --- readme.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index 452a115..ca231cc 100644 --- a/readme.md +++ b/readme.md @@ -1,17 +1,19 @@ ## Adopt Platypus ## -Create landing page and about us page -Landing page: A website that will help people to adopt a platypus. It has info on how to care for platypus. It also has about us section. + +A website that will help people to adopt a platypus. It has info on how to care for platypus. It also has about us section. ## Team Members ## -Phil (Product Owner) -Anh (Scrum Master) -Austin (DEV) +* Phil (*Product Owner*) +* Anh (*Scrum Master*) +* Austin (*DEV*) +* Vy (*DEV*) ## View At ## + https://github.com/vietanhdtd/adopt-platypus From c776eb4b81ff5ce82997521322645d0ca6590ddf Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 10 May 2019 14:33:39 +0700 Subject: [PATCH 2/5] edit the footer --- index.html | 4 ++-- style.css | 40 ++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/index.html b/index.html index a83a20d..fcd171e 100644 --- a/index.html +++ b/index.html @@ -112,7 +112,7 @@
ANH
Startup-logo -
+
Company
  • About
    • @@ -136,7 +136,7 @@
    ANH
- @@ -76,7 +91,9 @@
ENVIRONMENT
Some Tips
EXTRA TIPS
-

- platypus have venomous barb. Be careful when handling them
- it’s actually ILLEGAL to own a platypus, bylaw according to Australian wildlife
- Those with a license to handle platypus can rescue them. After rehab platypus +

- platypus have venomous barb. Be careful when handling them
- it’s + actually ILLEGAL to own a platypus, bylaw according to Australian wildlife
- Those with a + license to handle platypus can rescue them. After rehab platypus are released back into the wild.

More Info
@@ -110,8 +127,8 @@
ANH
- Startup-logo + Startup-logo
Company
    @@ -136,14 +153,14 @@
    ANH
- - + +
diff --git a/style.css b/style.css index 67565a4..378f77b 100644 --- a/style.css +++ b/style.css @@ -61,7 +61,7 @@ footer { } .nav-linkto:hover { - color: #189090!important; + color: #189090 !important; } .btn-nav { @@ -81,6 +81,19 @@ footer { border: none; } +.res-invisible-1 { + display: none; +} + +@media screen and (max-width: 989px) { + .res-invisible-2 {display: none;} + .res-invisible-1 {display: block;} +} + +nav ul { + display: flex; + align-items: center; +} /* header style */ @@ -97,13 +110,16 @@ footer { padding: 20px 0px; margin: 0px auto; width: 60rem; + height: 18rem; } .header-title { font-size: 60px; font-family: 'Sanomat Grab Web Regular', sans-serif; - padding-bottom: 15px; - color: #D86000; + padding-bottom: 10px; + color: #F09048; + text-align: center; + } .header-subtitle { @@ -111,7 +127,23 @@ footer { font-weight: 300; font-family: 'Sanomat Grab Web Regular', sans-serif; letter-spacing: 1px; - padding-bottom: 20px; + padding-bottom: 25px; + color: #F09048; + text-align: center; +} + +#header-button { + font-family: 'Sanomat Grab Web Regular', sans-serif; + font-size: 1.146em; + font-weight: 400; + color: ##F09048; + border-color: #F09048; +} + +#header-button:hover { + color: white; + border-color: #189090; + background-color: #189090; } /* footer style */ @@ -142,32 +174,6 @@ li:hover{ margin-top: 50px; } -<<<<<<< HEAD -.social-media-btn { - justify-content: center; - display: flex; - margin-top: 50px; -} - -.fa { - margin: 0px 20px 0 0; - padding: 15px; - width: 60px; - height: 60px; - font-size: 30px; - text-align: center; - border-radius: 50%; - color: #D86000; - background-color: #222326; - text-decoration: none; -} -.fa:hover{ - color: #D86000; - cursor: pointer; -} -a:hover { - text-decoration: none; -======= /* environment-style */ .card-body-flex { @@ -192,17 +198,4 @@ a:hover { .avatar { border-radius: 50%; width: 200px; -} - -#header-button { - font-family: 'Sanomat Grab Web Regular', sans-serif; - font-size: 1.146em; - font-weight: 400; - color: #D86000; - border-color: #D86000; -} - -#header-button:hover { - background-color: black ->>>>>>> 134d7a8dedcc21a84e6046dc21188c6fdfb55215 } \ No newline at end of file From 03dc0802b981ae1eb5cc4ce4ef09ac61e156ed7f Mon Sep 17 00:00:00 2001 From: Philip Nguyen Date: Fri, 10 May 2019 15:57:08 +0700 Subject: [PATCH 5/5] new branch. nav edit. header edit. --- index.html | 98 +++++++++++++++++++++++++++++++++++++++--------------- readme.md | 12 ++++--- style.css | 69 ++++++++++++++++++++++++++++++-------- 3 files changed, 134 insertions(+), 45 deletions(-) diff --git a/index.html b/index.html index fcad75e..3c1b860 100644 --- a/index.html +++ b/index.html @@ -13,17 +13,15 @@ - - + + -