From fbc37bda4f359e2d10a54c6ad9fe6956b5b5afee Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 13:02:38 -0800 Subject: [PATCH 1/8] added html to index.html file lines 1-75 --- great-idea-website/index.html | 97 ++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 37 deletions(-) diff --git a/great-idea-website/index.html b/great-idea-website/index.html index 92beabd65..e70104115 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -3,9 +3,9 @@ - - Great Idea! - +
+ Great Idea! +
@@ -15,41 +15,64 @@ - - Services - Product - Vision - Features - About - Contact - - - Innovation - On - Demand - - Get Started - - Image of a code snippet. - - Features - Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis. - - - About - Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis. - + + +
+

+ Innovation + On + Demand +

+
+
+ Get Started + + Image of a code snippet. +
+
+
+

Features

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
+
+
+

About

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
+
Image of code snippets across the screen - - Services - Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis. - - - Product - Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis. - - Vision - Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis. +
+
+
+

Services

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
+
+
+

Product

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
+
+
+

Vision

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
Contact 123 Way 456 Street From e7a5169fcecc8cc4a2f7dc28b27f19427bbc3442 Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 13:49:18 -0800 Subject: [PATCH 2/8] added more html to index.html file and started css on head, links, title, h1, h2, h3 --- great-idea-website/css/index.css | 55 +++++++++++++++++++++++++++++++- great-idea-website/index.html | 29 +++++++++++------ 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index 7766e7f18..47fd80ff7 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -63,4 +63,57 @@ h1, h2, h3, h4, h5 { margin-bottom: 15px; } -/* Your code starts here! */ \ No newline at end of file +/* Your code starts here! */ + +* { + box-sizing: border-box; + padding:0; + margin:0; + max-width:100%; +} + +html{ + font-size:62.5%; +} + +body{ + line-height:2; + font-size:1.5rem; + font-family: 'Nunito Sans', sans-serif; +} + +title { + font-family: 'Fjalla One', sans-serif; + letter-spacing:2.5px; + padding:5% 0; +} + +h1 { + font-family: 'Fjalla One', sans-serif; + letter-spacing:2.5px; + padding:5% 0; + font-size:6rem; + font-weight: bold; +} + +h2, h3 { + font-family: 'Fjalla One', sans-serif; + letter-spacing:2.5px; + padding:5% 0; +} + +.links{ + width:80%; + display:inline-block; + text-align: center; + + } + + nav a{ + color:rgb(45, 9, 129); + text-decoration:none; + letter-spacing:3px; + padding: 10px + } + nav a:hover{ + color:#AFEEEE; diff --git a/great-idea-website/index.html b/great-idea-website/index.html index e70104115..c119f5af8 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -28,13 +28,13 @@ -
+

Innovation On Demand

-
+
Get Started @@ -73,14 +73,23 @@

Vision

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

- - Contact - 123 Way 456 Street - Somewhere, USA - 1 (888) 888-8888 - sales@greatidea.io - +
+

Contact

+
+
+ 123 Way 456 Street + Somewhere, USA +
+
+ 1 (888) 888-8888 +
+
+ sales@greatidea.io +
+
+ +
\ No newline at end of file From e8745c4310c2be130cf837b084de226fc4e922b4 Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 16:16:07 -0800 Subject: [PATCH 3/8] made html changes to header. Added CSS. --- great-idea-website/css/index.css | 54 ++++++++++++++++++++++++-------- great-idea-website/index.html | 48 ++++++++++++++-------------- 2 files changed, 65 insertions(+), 37 deletions(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index 47fd80ff7..e5fb5371d 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -82,38 +82,66 @@ body{ font-family: 'Nunito Sans', sans-serif; } -title { +title{ font-family: 'Fjalla One', sans-serif; letter-spacing:2.5px; padding:5% 0; } -h1 { +h1{ font-family: 'Fjalla One', sans-serif; - letter-spacing:2.5px; - padding:5% 0; + padding:0 15%; font-size:6rem; font-weight: bold; + display: inline-block; + white-space: pre-line; + } -h2, h3 { +h2, h3{ font-family: 'Fjalla One', sans-serif; letter-spacing:2.5px; padding:5% 0; } -.links{ +.links { width:80%; display:inline-block; text-align: center; - } +} - nav a{ - color:rgb(45, 9, 129); - text-decoration:none; - letter-spacing:3px; - padding: 10px +nav a{ + color: slategray; + text-decoration: none; + margin: 0 3%; + display: inline-block; } - nav a:hover{ + +nav a:hover{ color:#AFEEEE; +} + +button{ + display: inline-block; +} + +.header-img { + display:inline-block; + width: 40%; +} + +#features div{ + text-align: center; + width: 30%; + display: inline-block; + margin: 0 3%; +} +#features h2 { + text-align: center; + padding: 3% 0; +} + +#features div p{ + text-align:justify; +} \ No newline at end of file diff --git a/great-idea-website/index.html b/great-idea-website/index.html index c119f5af8..5f026a2b8 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -14,32 +14,32 @@ - - - -
+ +
+ +
+

- Innovation - On - Demand + Innovation + On + Demand

-
-
- Get Started - +
+ +
Image of a code snippet. -
+ > +

Features

@@ -88,7 +88,7 @@

Contact

From ee226305ca5232a03cdc918e25196edc5aec02be Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 17:00:48 -0800 Subject: [PATCH 4/8] added parent selector to html, added CSS --- great-idea-website/css/index.css | 69 ++++++++++++++++++++++++++++++++ great-idea-website/index.html | 6 ++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index e5fb5371d..85444d3e7 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -130,7 +130,10 @@ button{ display:inline-block; width: 40%; } +.top { + width: 100%; +} #features div{ text-align: center; width: 30%; @@ -144,4 +147,70 @@ button{ #features div p{ text-align:justify; +} + +#about div { + text-align: center; + width: 30%; + display: inline-block; + margin: 0 3%; +} + +#about h2 { + text-align: center; + padding: 3% 0; +} + +#about div p { + text-align: justify; +} + +.bottom { + width:100%; +} + +#services div { + text-align: center; + width: 20%; + display: inline-block; + margin: 0 3%; +} +#services h2 { + text-align:center; + padding: 3% 0; + +} + +#services div p{ + text-align:justify; +} + +#product div { + text-align: center; + width: 20%; + display: inline-block; + margin: 0 3%; +} + +#product h2 { + text-align:center; + padding:3% 0; +} +#product div p { + text-align: justify; +} + +#vision div{ + text-align: center; + width: 20%; + display: inline-block; + margin: 0 3%; +} + +#vision h2 { + text-align:center; + padding:3% 0; +} +#vision div p{ + text-align: justify; } \ No newline at end of file diff --git a/great-idea-website/index.html b/great-idea-website/index.html index 5f026a2b8..c2f8f9321 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -28,7 +28,7 @@
-
+

Innovation On @@ -40,6 +40,7 @@

Image of a code snippet.

> +

Features

@@ -52,9 +53,11 @@

About

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
Image of code snippets across the screen
+

Services

@@ -73,6 +76,7 @@

Vision

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+

Contact

From 190716853d84050d2cdb2c304e6a40f95e7aeb98 Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 22:05:16 -0800 Subject: [PATCH 5/8] updated html with parent sections and divs. Deleted CSS past line 132 to start over with new html markups --- great-idea-website/css/index.css | 81 ----------------------------- great-idea-website/index.html | 89 +++++++++++++++----------------- 2 files changed, 42 insertions(+), 128 deletions(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index 85444d3e7..85b027cb7 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -130,87 +130,6 @@ button{ display:inline-block; width: 40%; } -.top { - width: 100%; -} -#features div{ - text-align: center; - width: 30%; - display: inline-block; - margin: 0 3%; -} -#features h2 { - text-align: center; - padding: 3% 0; -} - -#features div p{ - text-align:justify; -} - -#about div { - text-align: center; - width: 30%; - display: inline-block; - margin: 0 3%; -} -#about h2 { - text-align: center; - padding: 3% 0; -} -#about div p { - text-align: justify; -} - -.bottom { - width:100%; -} - -#services div { - text-align: center; - width: 20%; - display: inline-block; - margin: 0 3%; -} -#services h2 { - text-align:center; - padding: 3% 0; - -} - -#services div p{ - text-align:justify; -} - -#product div { - text-align: center; - width: 20%; - display: inline-block; - margin: 0 3%; -} - -#product h2 { - text-align:center; - padding:3% 0; -} -#product div p { - text-align: justify; -} - -#vision div{ - text-align: center; - width: 20%; - display: inline-block; - margin: 0 3%; -} - -#vision h2 { - text-align:center; - padding:3% 0; -} -#vision div p{ - text-align: justify; -} \ No newline at end of file diff --git a/great-idea-website/index.html b/great-idea-website/index.html index c2f8f9321..11a2b9356 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -27,70 +27,65 @@
-
-
+
+

- Innovation - On - Demand + Innovation + On + Demand

+

Get Started

-
Image of a code snippet.
> - -
-
-
-

Features

-

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

-
-
-
-

About

-

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+ +
+
+
+

Features

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
+

About

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
-
Image of code snippets across the screen
-
-
-
-

Services

-

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

-
-
-
-
-

Product

-

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

-
-
-
-
+
+
+
+

Services

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+
+

Product

+

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
+

Vision

Aliquam elementum magna eros, ac posuere elvit tempus et. Suspendisse vel tempus odio, in interdutm nisi. Suspendisse eu ornare nisl. Nullam convallis augue justo, at imperdiet metus scelerisque quis.

+
-
-

Contact

-
-
- 123 Way 456 Street - Somewhere, USA -
-
- 1 (888) 888-8888 -
-
- sales@greatidea.io -
-
+
+

Contact

+
+ 123 Way 456 Street + Somewhere, USA +
+
+ 1 (888) 888-8888 +
+ +
From 9c41a4677828b4dedcbd631822119aa7cfd7b9d7 Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 22:46:17 -0800 Subject: [PATCH 6/8] edited CSS heading and headingtext to center align --- great-idea-website/css/index.css | 34 +++++++++++--------------------- great-idea-website/index.html | 18 ++++++++++------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index 85b027cb7..bce4659c2 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -72,15 +72,6 @@ h1, h2, h3, h4, h5 { max-width:100%; } -html{ - font-size:62.5%; -} - -body{ - line-height:2; - font-size:1.5rem; - font-family: 'Nunito Sans', sans-serif; -} title{ font-family: 'Fjalla One', sans-serif; @@ -89,23 +80,24 @@ title{ } h1{ - font-family: 'Fjalla One', sans-serif; - padding:0 15%; font-size:6rem; font-weight: bold; - display: inline-block; white-space: pre-line; + letter-spacing: 3px; } -h2, h3{ - font-family: 'Fjalla One', sans-serif; - letter-spacing:2.5px; - padding:5% 0; +#h1-img h2{ + border: solid; + width: 150px; + height:66px; + text-align: center; + padding-top: 25px; } + .links { - width:80%; + width:100%; display:inline-block; text-align: center; @@ -122,14 +114,10 @@ nav a:hover{ color:#AFEEEE; } -button{ - display: inline-block; -} -.header-img { - display:inline-block; - width: 40%; + } + diff --git a/great-idea-website/index.html b/great-idea-website/index.html index 11a2b9356..18a8bdbbf 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -29,16 +29,20 @@
-

- Innovation - On - Demand -

-

Get Started

+
+

+ Innovation + On + Demand +

+
+
+

Get Started

+
Image of a code snippet. -
> +
From b50bb030e9beef5dc177da4e0c7ce422df8caee6 Mon Sep 17 00:00:00 2001 From: Melissa Date: Wed, 15 Jan 2020 23:41:56 -0800 Subject: [PATCH 7/8] updated id h1-img in CSS to display inline block centered --- great-idea-website/css/index.css | 48 +++++++++++++++++++------------- great-idea-website/index.html | 12 ++++---- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index bce4659c2..c69388f7a 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -79,27 +79,11 @@ title{ padding:5% 0; } -h1{ - font-size:6rem; - font-weight: bold; - white-space: pre-line; - letter-spacing: 3px; - -} - -#h1-img h2{ - border: solid; - width: 150px; - height:66px; - text-align: center; - padding-top: 25px; -} - - .links { width:100%; display:inline-block; text-align: center; + padding-top: 30px; } @@ -108,16 +92,42 @@ nav a{ text-decoration: none; margin: 0 3%; display: inline-block; + } nav a:hover{ color:#AFEEEE; } +#h1-img { + width:100%; + padding: 3% 0; + margin: 0 10%; +} +h1{ + font-size:5rem; + white-space: pre-line; + letter-spacing: 2px; + text-align: center; + + +} - - +#h1-img h2{ + border: solid; + width: 150px; + height:66px; + text-align: center; + padding-top: 25px; + margin: 0 36%; + } +#h1-img .headcontainer div{ + width: 36%; + display: inline-block; + padding: 2% 0; + margin: 0 3%; +} diff --git a/great-idea-website/index.html b/great-idea-website/index.html index 18a8bdbbf..c1f334925 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -28,20 +28,18 @@
-
+

Innovation On Demand -

-
-
+

Get Started

+
+
+ Image of a code snippet.
-
-
- Image of a code snippet.
From ed48c9b2192894bb8faa60268c5e0e9477a3f305 Mon Sep 17 00:00:00 2001 From: Melissa Date: Thu, 16 Jan 2020 00:13:24 -0800 Subject: [PATCH 8/8] edited copyright section to div in index.html file. Added CSS for the entire web page. HTML and CSS are complete --- great-idea-website/css/index.css | 40 ++++++++++++++++++++++++++++++++ great-idea-website/index.html | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/great-idea-website/css/index.css b/great-idea-website/css/index.css index c69388f7a..d3fcb3156 100644 --- a/great-idea-website/css/index.css +++ b/great-idea-website/css/index.css @@ -130,4 +130,44 @@ h1{ margin: 0 3%; } +#top { + padding: 3% 0; + margin: 0 10%; + border-top: 2px solid black; + +} +#top .container div{ + text-align:left; + width: 30%; + display:inline-block; + margin: 0 8%; + padding: 3% 0; +} + +.middle-img { + display: block; + margin-left: auto; + margin-right: auto; + width: 80%; +} +#bottom { + padding: 3% 0; + margin: 0 10%; + border-bottom: 2px solid black; +} + +#bottom .container2 div{ + text-align:left; + width: 23%; + display:inline-block; + margin: 0 5%; + padding: 3% 0; +} +#contact{ + margin: 0 10%; + padding: 3% 0; +} +#Copyright { + text-align: center; +} \ No newline at end of file diff --git a/great-idea-website/index.html b/great-idea-website/index.html index c1f334925..c91cfa1d3 100644 --- a/great-idea-website/index.html +++ b/great-idea-website/index.html @@ -88,9 +88,9 @@

Contact

sales@greatidea.io
- + \ No newline at end of file