From 8160c46ab6356067cea8e0e951d764b7b161b7e4 Mon Sep 17 00:00:00 2001 From: Kevin Gallardo Date: Fri, 8 May 2020 11:36:44 -0600 Subject: [PATCH 1/4] index Done --- about.html | 26 ++++++--- css/index.css | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 13 ++++- 3 files changed, 183 insertions(+), 8 deletions(-) diff --git a/about.html b/about.html index 9f133e274a..03cdf30168 100644 --- a/about.html +++ b/about.html @@ -2,6 +2,16 @@ +
+lambda logo + +
Sprint Challenge - About @@ -12,13 +22,14 @@ + About Jumbo
- - About - - Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment. +

About

+ +

Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.

+
strategy Strategy @@ -37,7 +48,7 @@ Learn More - + strategy @@ -58,7 +69,7 @@ Let's Work Together Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment. - +
- \ No newline at end of file + + diff --git a/css/index.css b/css/index.css index ae29d6ceee..b2cccb51a7 100644 --- a/css/index.css +++ b/css/index.css @@ -77,6 +77,7 @@ p { justify-content: space-evenly; margin-bottom: 20px; border-bottom: 1px dashed black; + } .top-content .text-container { @@ -138,9 +139,160 @@ footer nav { align-items: center; padding: 20px 2%; font-size: 14px; + } footer nav a { color: white; text-decoration: none; +} + +/* Color Boxes */ +.middle-content .box:nth-child(1){ + background-color: teal; +} +.middle-content .box:nth-child(2){ + background-color: #FFD700; +} + +.middle-content .box:nth-child(3){ + background-color: #5F9EA0; +} + +.middle-content .box:nth-child(4){ + background-color:#FF7F50 ; +} + +.middle-content .box:nth-child(5){ + background-color: #DC143C; +} + +.middle-content .box:nth-child(6){ + background-color: #228B22; +} + +.middle-content .box:nth-child(7){ + background-color: #9932CC; +} + +.middle-content .box:nth-child(8){ + background-color: #FF69B4; +} + +.middle-content .box:nth-child(9){ + background-color: #4B0082; +} + +.middle-content .box:nth-child(10){ + background-color: #1E90FF; +} + + +/* Header*/ +header nav { + width: 60%; + display: flex; + justify-content: space-between; + align-items: center; + padding: 20px 2%; + font-size: 14px; +} + +header { + display: flex; + justify-content: flex-end; + width: 100%; + padding-right: 10%; +} +header nav a{ + font-weight: bold; + font-size: 15px; + color:black; + text-decoration: none; + +} +/* Images */ +header img{ + width: 5; + height:5%; + margin-right: 80px; + margin-top: 20px; +} +.top-content img{ + margin-top: 20px; + margin-bottom: 25px;; +} + + +/* About page */ + +.about-header{ + font-weight: bold; + font-size: 15px; + color:black; + text-decoration: none; + display:flex; + justify-content: flex-end; +} + +/* About Images */ + +.about-header img{ + width: 5; + height:5%; + margin-bottom: 15px; +} + +.jumbo-about{ + margin-left: 11%; + width:90%; + margin-bottom: 25px; +} + +.container.about-page{ + display:flex;; + flex-wrap: wrap; + width:90%; + margin-left:10%; +} + + +/* about info */ + +p{ + border-bottom: 2px dotted black; + margin-bottom: 5%; + padding: 3%; + font-size: 15px; + font-weight: bold; + +} +h2{ + font-weight: bold; +} + +@media(max-width:500px){ +footer{ + display: none; +} + header nav{ + display: flex; + justify-content: center; + flex-direction: column; + padding-top: 25%; + } + .top-content img{ + width:50%; + padding-left: 5%; + } + .top-content{ + display: flex; + justify-content: center; + flex-direction: column; +} +} +.container-content{ + display: flex; + flex-wrap: wrap; + background-color: red; } \ No newline at end of file diff --git a/index.html b/index.html index c6405aef71..8e73f59e8e 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,17 @@ +
+ + + +
Sprint Challenge - Home @@ -15,7 +26,7 @@
-
+ jumbo

The Future

Proin sed quam sed tellus vestibulum ultrices quis in nunc. Phasellus id dui id tortor tincidunt efficitur. Proin faucibus imperdiet erat, non varius lacus. Maecenas non nisl id turpis egestas tincidunt. Nam condimentum venenatis magna eget finibus.

From 9dce05596853033ca3831f77e481fea7fcd9fa0b Mon Sep 17 00:00:00 2001 From: Kevin Gallardo Date: Fri, 8 May 2020 11:55:10 -0600 Subject: [PATCH 2/4] 11:55am --- about.html | 11 +++++++---- css/index.css | 25 ++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/about.html b/about.html index 03cdf30168..f8052cbc14 100644 --- a/about.html +++ b/about.html @@ -30,14 +30,15 @@

About

Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment.

+
strategy - Strategy +

Strategy

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. - Learn More - + +
strategy @@ -49,7 +50,7 @@

About

Learn More - +
strategy Places We Work @@ -57,7 +58,9 @@

About

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Learn More +
+ strategy Collaboration diff --git a/css/index.css b/css/index.css index b2cccb51a7..8626d166eb 100644 --- a/css/index.css +++ b/css/index.css @@ -294,5 +294,28 @@ footer{ .container-content{ display: flex; flex-wrap: wrap; - background-color: red; + justify-content: space-evenly; + + width: 75%; + +} +.strats{ + display: flex; + flex-direction: column; + width: 25%; +} +.strats button{ + margin-top: 5%; + width:35%; + border-radius: 5px; + text-align: center; + height: 30px; + background-color: white; + border: 2px solid black; + font-weight: bolder; +} + +.howWork{ + width: 15%; + border: 2 px solid red; } \ No newline at end of file From de381e01e91a4270ce866e1e69de030527dc109c Mon Sep 17 00:00:00 2001 From: Kevin Gallardo Date: Fri, 8 May 2020 13:03:32 -0600 Subject: [PATCH 3/4] Finished --- about.html | 22 ++++++++++----------- css/index.css | 55 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/about.html b/about.html index f8052cbc14..3efc2d533b 100644 --- a/about.html +++ b/about.html @@ -40,35 +40,35 @@

Strategy

- +
strategy - How We Work +

How We Work

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. - Learn More - + +
-
+
strategy - Places We Work +

Places We Work

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. - Learn More +
- +
strategy - Collaboration +

Collaboration

Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. - Learn More - + +
Let's Work Together Leverage agile frameworks to provide a robust synopsis for high level overviews. Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. Organically grow the holistic world view of disruptive innovation via workplace diversity and empowerment. diff --git a/css/index.css b/css/index.css index 8626d166eb..5a23525f4f 100644 --- a/css/index.css +++ b/css/index.css @@ -294,8 +294,7 @@ footer{ .container-content{ display: flex; flex-wrap: wrap; - justify-content: space-evenly; - + justify-content: space-between; width: 75%; } @@ -303,6 +302,7 @@ footer{ display: flex; flex-direction: column; width: 25%; + margin-left: 15%; } .strats button{ margin-top: 5%; @@ -315,7 +315,52 @@ footer{ font-weight: bolder; } -.howWork{ - width: 15%; - border: 2 px solid red; +.places{ + width: 25%; + margin-top: 30px; + display: flex; + flex-direction: column; +} +.places button{ + margin-top: 5%; + width:35%; + border-radius: 5px; + text-align: center; + height: 30px; + background-color: white; + border: 2px solid black; + font-weight: bolder; +} +.work{ + margin-left: 25%; + width: 25%; + +} +.work button{ + display: flex; + margin-top: 5%; + width:35%; + border-radius: 5px; + height: 30px; + background-color: white; + border: 2px solid black; + font-weight: bolder; + text-align: center; +} +.collab{ + display: flex; + flex-direction: column; + width: 25%; + margin-top: 30px; +} +.collab button{ + margin-top: 5%; + width:35%; + border-radius: 5px; + text-align: center; + height: 30px; + background-color: white; + border: 2px solid black; + font-weight: bolder; + } \ No newline at end of file From 849063028fa2ac14179799ae14702557a1e51214 Mon Sep 17 00:00:00 2001 From: Kevin Gallardo Date: Fri, 8 May 2020 16:47:50 -0600 Subject: [PATCH 4/4] finished v2 --- README.md | 2 +- css/index.css | 34 +++++++++++++++++++++++++++++++++- index.html | 17 ++++++++++++----- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d17421efd1..5584c644f5 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Demonstrate your understanding of this week's concepts by answering the followin Edit this document to include your answers after each question. Make sure to leave a blank line above and below your answer so it is clear and easy to read by your project manager -1. If you were to describe semantic HTML to the next cohort of students, what would you say? +1. If you were to describe semantic HTML to the next cohort of students, what would you say? 2. Name two big differences between ```display: block;``` and ```display: inline;```. diff --git a/css/index.css b/css/index.css index 5a23525f4f..80ca014a22 100644 --- a/css/index.css +++ b/css/index.css @@ -363,4 +363,36 @@ footer{ border: 2px solid black; font-weight: bolder; -} \ No newline at end of file +} + +@media(max-width: 800px){ + .top-content{ + display: flex; + flex-direction: column; + justify-content: space-evenly; + text-align: center; + margin-left: 40%; + border:none; + + } + .boxes{ + display:flex; + flex-direction: column; + align-items: center; + } + .bottom-content{ + display: flex; + + } + .bottom-content h2{ + font-size: 25px; + } + footer nav{ + margin-left: 20%; + text-align: center; + font-size: 25px; + } +.container img{ + margin: 25px; +} +} \ No newline at end of file diff --git a/index.html b/index.html index 8e73f59e8e..b6d6245d28 100644 --- a/index.html +++ b/index.html @@ -25,15 +25,20 @@
-
- jumbo
+ + jumbo +
+
+

The Future

Proin sed quam sed tellus vestibulum ultrices quis in nunc. Phasellus id dui id tortor tincidunt efficitur. Proin faucibus imperdiet erat, non varius lacus. Maecenas non nisl id turpis egestas tincidunt. Nam condimentum venenatis magna eget finibus.

The Past

Proin sed quam sed tellus vestibulum ultrices quis in nunc. Phasellus id dui id tortor tincidunt efficitur. Proin faucibus imperdiet erat, non varius lacus. Maecenas non nisl id turpis egestas tincidunt. Nam condimentum venenatis magna eget finibus.

-
+ +
+
@@ -81,6 +86,8 @@

Moon

Contact -
+
+ + - \ No newline at end of file +