From e40adb6bc5d9f1fe3e0d652f8650b7bc634484c8 Mon Sep 17 00:00:00 2001 From: Silvana K <84741857+sikoh@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:28:04 -0400 Subject: [PATCH 1/6] building the navigatin of the index file --- about.html | 101 ++++++------- css/index.css | 390 +++++++++++++++++++++++++++++++++++++++----------- index.html | 164 ++++++++++++--------- 3 files changed, 457 insertions(+), 198 deletions(-) diff --git a/about.html b/about.html index 9f133e274..72e8c6c06 100644 --- a/about.html +++ b/about.html @@ -1,64 +1,68 @@ - + - - + + - Sprint Challenge - About + Sprint Challenge - About - - + + + - - - +
- - 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 - - Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. - - Learn More - - - - strategy - - How We Work - - Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. + + + - Learn More + 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 Iterative approaches to corporate strategy foster collaborative + thinking to further the overall value proposition. Learn More - strategy - - Places We Work + strategy - Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. + How We Work Iterative approaches to corporate strategy foster + collaborative thinking to further the overall value proposition. Learn + More - Learn More + strategy - strategy - - Collaboration - - Iterative approaches to corporate strategy foster collaborative thinking to further the overall value proposition. + Places We Work Iterative approaches to corporate strategy foster + collaborative thinking to further the overall value proposition. Learn + More - Learn More + strategy - Let's Work Together + 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. - 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 ae29d6cee..2c4bff598 100644 --- a/css/index.css +++ b/css/index.css @@ -3,144 +3,366 @@ License: none (public domain) */ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; +html, +body, +div, +span, +applet, +object, +iframe, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +a, +abbr, +acronym, +address, +big, +cite, +code, +del, +dfn, +em, +img, +ins, +kbd, +q, +s, +samp, +small, +strike, +strong, +sub, +sup, +tt, +var, +b, +u, +i, +center, +dl, +dt, +dd, +ol, +ul, +li, +fieldset, +form, +label, +legend, +table, +caption, +tbody, +tfoot, +thead, +tr, +th, +td, +article, +aside, +canvas, +details, +embed, +figure, +figcaption, +footer, +header, +hgroup, +menu, +nav, +output, +ruby, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; } + /* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section { + display: block; } body { - line-height: 1; + line-height: 1; } -ol, ul { - list-style: none; +ol, +ul { + list-style: none; } -blockquote, q { - quotes: none; +blockquote, +q { + quotes: none; } -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ""; + content: none; } table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } * { - box-sizing: border-box; + box-sizing: border-box; } -html, body { - height: 100%; - font-family: 'Roboto', sans-serif; +html, +body { + height: 100%; + font-family: "Roboto", sans-serif; + font-weight: bolder; + color: #505050; } -h1, h2, h3, h4, h5 { - font-size: 18px; - margin-bottom: 15px; - font-family: 'Rubik', sans-serif; +h1, +h2, +h3, +h4, +h5 { + font-size: 18px; + margin-bottom: 15px; + font-family: "Rubik", sans-serif; } p { - line-height: 1.4; + line-height: 1.4; } .container { - width: 800px; - margin: 0 auto; + width: 800px; + margin: 0 auto; +} + +nav { + display: flex; + margin: 4% 0 4%; + font-weight: bolder; + color: #505050; +} +.links { + margin-top: 3%; + width: 400%; + display: flex; + justify-content: space-evenly; +} + +.links a { + text-decoration: none; + color: #505050; + font-size: 14px; +} + +#under-menu { + height: 150px; + width: 100%; + background-image: url("../img/jumbo.jpg"); + margin-bottom: 3%; } .top-content { - display: flex; - flex-wrap: wrap; - justify-content: space-evenly; - margin-bottom: 20px; - border-bottom: 1px dashed black; + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; + margin-bottom: 20px; + border-bottom: 1px dashed black; } .top-content .text-container { - width: 48%; - padding: 0 1%; - padding-bottom: 20px; + width: 48%; + padding: 0 1%; + padding-bottom: 20px; } .middle-content { - margin-bottom: 20px; - border-bottom: 1px dashed black; + margin-bottom: 20px; + border-bottom: 1px dashed black; } .middle-content h2 { - padding: 0 2%; - margin-bottom: 0; + padding: 0 2%; + margin-bottom: 0; } .middle-content .boxes { - display: flex; - flex-wrap: wrap; - justify-content: space-evenly; + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; +} + +.middle-content .box { + width: 12.5%; + height: 100px; + background: black; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} + +.box1 { + background-color: teal; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} +.box2 { + background-color: gold; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} + +.box3 { + background-color: cadetblue; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} +.box4 { + background-color: coral; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; } -.middle-content .boxes .box { - width: 12.5%; - height: 100px; - background: black; - margin: 20px 2.5%; - color: white; - display: flex; - align-items: center; - justify-content: center; +.box5 { + background-color: crimson; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} + +.box6 { + background-color: forestgreen; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} + +.box7 { + background-color: darkorchid; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} +.box8 { + background-color: hotpink; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} + +.box9 { + background-color: indigo; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; +} +.box10 { + background-color: dodgerblue; + width: 12.5%; + height: 100px; + margin: 20px 2.5%; + color: white; + display: flex; + align-items: center; + justify-content: center; } .bottom-content { - display: flex; - margin: 0 2% 20px; - justify-content: space-around; + display: flex; + margin: 0 2% 20px; + justify-content: space-around; } .bottom-content .text-container { - padding-right: 4%; + padding-right: 4%; } .bottom-content .text-container:last-child { - padding-right: 0; + padding-right: 0; } footer { - width: 100%; - background: black; + width: 100%; + background: black; } footer nav { - width: 60%; - display: flex; - justify-content: space-between; - align-items: center; - padding: 20px 2%; - font-size: 14px; + width: 60%; + display: flex; + justify-content: space-between; + align-items: center; + padding: 20px 2%; + font-size: 14px; } footer nav a { - color: white; - text-decoration: none; -} \ No newline at end of file + color: white; + text-decoration: none; + font-weight: normal; +} diff --git a/index.html b/index.html index c6405aef7..d325356b0 100644 --- a/index.html +++ b/index.html @@ -1,75 +1,107 @@ - + - - + + - Sprint Challenge - Home + Sprint Challenge - Home - - + + + - - - +
- -
-
-

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.

-
-
- -
- -

Why Did It Have To Be Boxes...

- -
-
Box 1
-
Box 2
-
Box 3
-
Box 4
-
Box 5
-
Box 6
-
Box 7
-
Box 8
-
Box 9
-
Box 10
-
- -
+ + +
+ +
+
+

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

+
+
+ +
+

Why Did It Have To Be Boxes...

-
+
+
Box 1
+
Box 2
+
Box 3
+
Box 4
+
Box 5
+
Box 6
+
Box 7
+
Box 8
+
Box 9
+
Box 10
+
+
-
-

That's

-

Phasellus id dui id tortor tincidunt efficitur. Proin sed quam sed tellus vestibulum ultrices quis in nunc.

-
-
-

No

-

Phasellus id dui id tortor tincidunt efficitur. Proin sed quam sed tellus vestibulum ultrices quis in nunc.

-
-
-

Moon

-

Phasellus id dui id tortor tincidunt efficitur. Proin sed quam sed tellus vestibulum ultrices quis in nunc.

-
+
+
+

That's

+

+ Phasellus id dui id tortor tincidunt efficitur. Proin sed quam sed + tellus vestibulum ultrices quis in nunc. +

+
+
+

No

+

+ Phasellus id dui id tortor tincidunt efficitur. Proin sed quam sed + tellus vestibulum ultrices quis in nunc. +

+
+
+

Moon

+

+ Phasellus id dui id tortor tincidunt efficitur. Proin sed quam sed + tellus vestibulum ultrices quis in nunc. +

+
+
-
- - -
- - \ No newline at end of file + + + + + From bb46e790c2b10c1fc0921335a7ca8cb5110641b7 Mon Sep 17 00:00:00 2001 From: Silvana K <84741857+sikoh@users.noreply.github.com> Date: Fri, 4 Jun 2021 15:59:39 -0400 Subject: [PATCH 2/6] Changes in css file and page about --- about.html | 94 +++++++++++++++++++++++++++++++++++---------------- css/index.css | 50 ++++++++++++++++++++++++++- 2 files changed, 114 insertions(+), 30 deletions(-) diff --git a/about.html b/about.html index 72e8c6c06..e15836f9c 100644 --- a/about.html +++ b/about.html @@ -15,14 +15,13 @@
- - + - 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 Iterative approaches to corporate strategy foster collaborative - thinking to further the overall value proposition. Learn More + +
- strategy + +
+

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

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

Strategy

+

+ Iterative approaches to corporate strategy foster collaborative + thinking to further the overall value proposition. +

+ +
- strategy +
+ strategy +

How We Work

+

+ Iterative approaches to corporate strategy foster collaborative + thinking to further the overall value proposition. +

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

Places We Work

+

+ Iterative approaches to corporate strategy foster collaborative + thinking to further the overall value proposition. +

+ +
- strategy +
+ strategy +

Collaboration

+

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

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

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

+
- +
strategy @@ -86,8 +86,9 @@

Collaboration

- + +

Let's Work Together!

diff --git a/css/index.css b/css/index.css index 94a85955c..140888c7f 100644 --- a/css/index.css +++ b/css/index.css @@ -137,8 +137,6 @@ html, body { height: 100%; font-family: "Roboto", sans-serif; - font-weight: bolder; - color: #505050; } h1, @@ -158,14 +156,16 @@ p { .container { width: 800px; margin: 0 auto; + font-weight: bolder; + color: #505050; } nav { display: flex; margin: 4% 0 4%; - font-weight: bolder; - color: #505050; + color: white; } + .links { margin-top: 3%; width: 100%; @@ -299,12 +299,14 @@ footer nav { align-items: center; padding: 20px 2%; font-size: 14px; + color: white; } footer nav a { color: white; text-decoration: none; font-weight: normal; + color: black; } /* css for about page*/ @@ -320,6 +322,8 @@ footer nav a { border-bottom: 1px dashed black; padding: 0% 2% 0% 2%; margin-bottom: 2%; + font-weight: normal; + color: black; } .Working-places, @@ -329,6 +333,8 @@ footer nav a { border-bottom: 1px dashed black; margin: 2.5%; width: 45%; + font-weight: normal; + color: black; } .picture-container { display: flex; @@ -353,4 +359,6 @@ p { .last-container { padding: 0% 2% 0% 2%; + font-weight: normal; + color: black; } diff --git a/index.html b/index.html index d325356b0..91f12193f 100644 --- a/index.html +++ b/index.html @@ -95,7 +95,7 @@

Moon

- +
strategy diff --git a/css/index.css b/css/index.css index 82d45f918..1dcea7e18 100644 --- a/css/index.css +++ b/css/index.css @@ -322,6 +322,7 @@ footer nav a { margin-bottom: 2%; font-weight: normal; color: black; + font; } .Working-places,