From 98e673e6ac6f532c74c279f704952a1443d5d2e4 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 11:18:20 -0500 Subject: [PATCH 01/71] It Has Begun --- css/index.css | 137 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/css/index.css b/css/index.css index e6b2b589c1..4df28c59af 100644 --- a/css/index.css +++ b/css/index.css @@ -1 +1,136 @@ -/* Should be empty until you compile your LESS */ \ No newline at end of file +/*------------------------------------*\ +RESET +\*------------------------------------*/ +/* http://meyerweb.com/eric/tools/css/reset/ +v2.0b1 | 201101 +NOTE:WORK IN PROGRESS +USE WITH CAUTION AND TEST WITH ABANDON */ +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, +figcaption, +figure, +footer, +header, +hgroup, +menu, +nav, +section, +summary, +time, +mark, +audio, +video { + margin: 0; + padding: 0; + border: 0; + outline: 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; +} +body { + line-height: 1; +} +ol, +ul { + list-style: none; +} +blockquote, +q { + quotes: none; +} +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ’’; + content: none; +} +ins { + text-decoration: none; +} +del { + text-decoration: line-through; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +/* Your Code Goes Here */ From a55a765d23c01879986f272059222f31f6e02490 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 12:07:22 -0500 Subject: [PATCH 02/71] top-menu-content --- css/index.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/css/index.css b/css/index.css index 4df28c59af..767f72e593 100644 --- a/css/index.css +++ b/css/index.css @@ -134,3 +134,11 @@ table { border-spacing: 0; } /* Your Code Goes Here */ + +* { + box-sizing: border-box; +} +.main-content-top img { + width: 300px; + height: 250px; +} \ No newline at end of file From 065e52a4f86e87e66685b95c3fa40888be8f22ad Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 12:45:56 -0500 Subject: [PATCH 03/71] html markup --- index.html | 172 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 101 insertions(+), 71 deletions(-) diff --git a/index.html b/index.html index 8a84a17304..339ab3016d 100644 --- a/index.html +++ b/index.html @@ -14,83 +14,113 @@

You got this! Good luck.

- - - - - - + +
+

S&J

+ +
+ + +
+

+ Integrity,
+ Excellence,
+ Progress. +

+ +
+ + +
+
+

Smith & Jones Architects

+

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

+ +
+ + +
+ +

Futuristic Designs

+

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

+ +
+
+ +
+

Recent Projects

+ +
+ +

THE VILLAS

+

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

+

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

+
+ +
+ +

OUTSKIRTS

+

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

+

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

+
+ +
+ +

THE BLOCKS

+

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

+

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

+
+
+
+ + +
+
+

Interested in starting a project? +
+ Let’s talk: +

+
+
Email:
+
+

We'll never share your email with anyone else.

+
+ +
+

New York

+123 Lane
+Suite 100
+Albany, NY 12345
202 555 0144 +
-Florida -Ocean Drive -Suite 201 -Orlando, FL 22345 +
+

>Florida

+Ocean Drive
+Suite 201
+Orlando, FL 22345
502 555 0144 +
-California -Mountain Street -Suite 105 -San Diego, CA 22345 +
+

California

+Mountain Street
+Suite 105
+San Diego, CA 22345
702 555 0144 +
+ +

Copyright © 2018 Smith and Jones

-Copyright © 2018 Smith and Jones ---> +
+ \ No newline at end of file From 1fd915e5717134c54bb56131d4e4a17b0273a113 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 14:21:34 -0500 Subject: [PATCH 04/71] Starting on CSS --- css/index.css | 14 +++++++++----- index.html | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/css/index.css b/css/index.css index 767f72e593..5829538168 100644 --- a/css/index.css +++ b/css/index.css @@ -135,10 +135,14 @@ table { } /* Your Code Goes Here */ -* { - box-sizing: border-box; + +.sNj { + display: inline-block; +} + +nav { + display: inline-block; } -.main-content-top img { - width: 300px; - height: 250px; +button { + border: #222222; } \ No newline at end of file diff --git a/index.html b/index.html index 339ab3016d..f0ae1901ff 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ -

You got this! Good luck.

+
From b2e3d976efbf2a3e162845ec8f226268041fdc8f Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 15:01:12 -0500 Subject: [PATCH 05/71] Forgot to Eat( Taking 10 minute break) --- css/index.css | 53 ++++++++++++++++++++++++++++++++++++++++++++----- index.html | 8 ++++---- less/index.less | 2 +- 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/css/index.css b/css/index.css index 5829538168..ddde079d20 100644 --- a/css/index.css +++ b/css/index.css @@ -136,13 +136,56 @@ table { /* Your Code Goes Here */ -.sNj { - display: inline-block; -} -nav { +.sNj, nav{ display: inline-block; + font-size: 16px; } + button { border: #222222; -} \ No newline at end of file +} +.villas, .outskirts, .blocks { + border: #D8D8D8; +} + +h2 { + font-size:64px; + line-height: 75px; + font-weight: bold; +} +h3 { +font-size: 28px; +font-weight: bold; +color: #222222; +} + +h4 { + font-size: 20px; +} + +.smithNjones, .futuristic { + width: 300px; +} + +.villas, .outskirts, .blocks { + width:300px; +} + +footer { + background: #828282; + color: #FFFFFF; + font-size: 14px; + line-height: 26px; +} + + +footer h3{ + color: #FFFFFF; +} + +.footer-heading { + font-size: 20px; + line-height: 24px; + color: #FFFFFF; +} diff --git a/index.html b/index.html index f0ae1901ff..099c978332 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,7 @@

Futuristic Designs

-

Recent Projects

+

Recent Projects

@@ -82,7 +82,7 @@

THE BLOCKS

-
+

Interested in starting a project?
Let’s talk: @@ -91,7 +91,7 @@

Interested in starting a project?
Email:

We'll never share your email with anyone else.

-
+

New York

@@ -102,7 +102,7 @@

New York

-

>Florida

+

Florida

Ocean Drive
Suite 201
Orlando, FL 22345
diff --git a/less/index.less b/less/index.less index 6d3fc81ef9..a7c22b8219 100644 --- a/less/index.less +++ b/less/index.less @@ -57,4 +57,4 @@ table{ border-spacing:0; } -/* Your Code Goes Here */ \ No newline at end of file +/* Your Code Goes Here */ From a18d7c680abb3826c3bc4f8a4895e12e86a759d7 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 15:59:08 -0500 Subject: [PATCH 06/71] Add color to see thing better --- css/index.css | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index ddde079d20..88fa237e91 100644 --- a/css/index.css +++ b/css/index.css @@ -135,11 +135,22 @@ table { } /* Your Code Goes Here */ +.container { + font-family: Roboto, Arial, sans-serif; + font-size: 1.6rem; + max-width: 600px; + margin: 0 auto; +} + +img { + border: 3px solid black; +} .sNj, nav{ display: inline-block; - font-size: 16px; + font-size: 20px; + border: 2px dotted cyan; } button { @@ -147,12 +158,19 @@ button { } .villas, .outskirts, .blocks { border: #D8D8D8; + margin-left: 100px;; +} +p { + font-size: 16px; + line-height: 24px; + border: 3px dashed maroon; } h2 { font-size:64px; line-height: 75px; font-weight: bold; + border: 4px dashed navy; } h3 { font-size: 28px; @@ -166,12 +184,16 @@ h4 { .smithNjones, .futuristic { width: 300px; + border: 4px solid deeppink; } -.villas, .outskirts, .blocks { +.villas , .outskirts , .blocks { width:300px; + margin-left: 200px; + border: 4px solid gray; } + footer { background: #828282; color: #FFFFFF; @@ -189,3 +211,7 @@ footer h3{ line-height: 24px; color: #FFFFFF; } + +address { + border: 4px dotted green; +} From 7bb5e5bed9bbb5bfd68a364d8746c155298976f3 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 17:03:59 -0500 Subject: [PATCH 07/71] ReNaming Content --- css/index.css | 5 ++++- index.html | 38 +++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/css/index.css b/css/index.css index 88fa237e91..100ace83d6 100644 --- a/css/index.css +++ b/css/index.css @@ -138,13 +138,16 @@ table { .container { font-family: Roboto, Arial, sans-serif; font-size: 1.6rem; - max-width: 600px; + max-width: 880px; margin: 0 auto; } img { border: 3px solid black; } +.jumbotron-img { + display: inline-block; +} .sNj, nav{ diff --git a/index.html b/index.html index 099c978332..a66f29673e 100644 --- a/index.html +++ b/index.html @@ -18,67 +18,67 @@ -
+

S&J

-
+ -
+

Integrity,
Excellence,
Progress.

- -
+ + -
-
+
+

Smith & Jones Architects

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
+
-
+

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
- + + -
+

Recent Projects

-
+

THE VILLAS

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
+
-
+

OUTSKIRTS

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
+ -
+

THE BLOCKS

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.


-
- + +
From 037ddf5875666543bc19fa614d10da7fbc3d590a Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 17:22:11 -0500 Subject: [PATCH 08/71] .. --- css/index.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/css/index.css b/css/index.css index 100ace83d6..25999ef9c6 100644 --- a/css/index.css +++ b/css/index.css @@ -142,13 +142,17 @@ table { margin: 0 auto; } -img { - border: 3px solid black; -} -.jumbotron-img { - display: inline-block; +header { + width: 100%; + display: flex; } +.jumbotron-text { + font-weight: bold; + font-size: 64px; + line-height: 75px; + /*color: #FFFFFF;*/ +} .sNj, nav{ display: inline-block; From 7f9bdc20bcf16c3908a70e900ac9d1c0e609b7c8 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 18:29:27 -0500 Subject: [PATCH 09/71] Aiming for Better Organization --- css/index.css | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/css/index.css b/css/index.css index 25999ef9c6..64c580c958 100644 --- a/css/index.css +++ b/css/index.css @@ -138,7 +138,7 @@ table { .container { font-family: Roboto, Arial, sans-serif; font-size: 1.6rem; - max-width: 880px; + max-width: 600px; margin: 0 auto; } @@ -153,6 +153,11 @@ header { line-height: 75px; /*color: #FFFFFF;*/ } +#img1, #img2 { + width:350px; + height: 350px; + display:inline-block; +} .sNj, nav{ display: inline-block; @@ -163,11 +168,29 @@ header { button { border: #222222; } + .main-content-top { + margin: 75px 0 35px 0; + padding: 35px 0; + font-size: 16px; + line-height: 18px; +} + +.main-content-top { + display: flex; + justify-content: space-around; +} +.smithNjones .futuristic { + display: inline-block; + width: 400px; +} + .villas, .outskirts, .blocks { border: #D8D8D8; margin-left: 100px;; } p { + display: inline-block; + width: 350px; font-size: 16px; line-height: 24px; border: 3px dashed maroon; @@ -189,13 +212,8 @@ h4 { font-size: 20px; } -.smithNjones, .futuristic { - width: 300px; - border: 4px solid deeppink; -} - .villas , .outskirts , .blocks { - width:300px; + width:350px; margin-left: 200px; border: 4px solid gray; } From 634ec751e2ebcb8502cc261a93dfc159334e3004 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 18:43:12 -0500 Subject: [PATCH 10/71] Looking Bettter --- css/index.css | 7 +++- index.html | 101 +++++++++++++++++++++++++------------------------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/css/index.css b/css/index.css index 64c580c958..9fa2321d7a 100644 --- a/css/index.css +++ b/css/index.css @@ -179,11 +179,16 @@ button { display: flex; justify-content: space-around; } -.smithNjones .futuristic { +.smithNjones, .smithNjones-img { display: inline-block; width: 400px; } +.futuristic, .futuristic-img { + display: inline-block; + width: 400px; +} + .villas, .outskirts, .blocks { border: #D8D8D8; margin-left: 100px;; diff --git a/index.html b/index.html index a66f29673e..6eb664c5d7 100644 --- a/index.html +++ b/index.html @@ -29,26 +29,27 @@

S&J

-

+
Integrity,
Excellence,
Progress. -

+
-
-
-

Smith & Jones Architects

+
+
+

Smith & Jones Architects

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

- + -
- -

Futuristic Designs

+ +
+ +

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

@@ -59,21 +60,21 @@

Recent Projects

-

THE VILLAS

+

THE VILLAS

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

OUTSKIRTS

+

OUTSKIRTS

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

THE BLOCKS

+

THE BLOCKS

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.


@@ -81,45 +82,45 @@

THE BLOCKS

-
-
-

Interested in starting a project? -
- Let’s talk: -

-
+
+
+

Interested in starting a project?
Let’s talk

+
Email:
-
-

We'll never share your email with anyone else.

-
- -
-

New York

-123 Lane
-Suite 100
-Albany, NY 12345
-202 555 0144 -
- -
-

Florida

-Ocean Drive
-Suite 201
-Orlando, FL 22345
-502 555 0144 -
- -
-

California

-Mountain Street
-Suite 105
-San Diego, CA 22345
-702 555 0144 -
- -

Copyright © 2018 Smith and Jones

- - +
+

We'll never share your email with anyone else.

+
+ +
+ +
+

New York

+ 123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144 +
+ +
+

Florida

+ Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144 +
+ +
+

California

+ Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144 +
+
+ +

Copyright © 2018 Smith and Jones

+ +
From 1ceaa7d764d81773a6ee6f1213d215f4f3d2b80e Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 21:40:38 -0500 Subject: [PATCH 11/71] Jumbo Image & Text --- css/index.css | 46 ++++++++++++++++++++++++++++++++++++++-------- index.html | 21 +++++++++++---------- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/css/index.css b/css/index.css index 9fa2321d7a..9ac48da7e4 100644 --- a/css/index.css +++ b/css/index.css @@ -138,9 +138,43 @@ table { .container { font-family: Roboto, Arial, sans-serif; font-size: 1.6rem; - max-width: 600px; + max-width: 880px; margin: 0 auto; } +.container .jumbotron{ + position: relative; + text-align:center; +} + +.top-left { + position:absolute; + top: 290px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 24px; + color: #FFFFFF; +} +.center { + position:absolute; + top: 360px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 24px; + color: #FFFFFF; +} +.bottom-left { + position:absolute; + top: 430px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 24px; + color: #FFFFFF; +} + + header { width: 100%; @@ -179,15 +213,11 @@ button { display: flex; justify-content: space-around; } -.smithNjones, .smithNjones-img { - display: inline-block; - width: 400px; +.subHeaders { + display: flex; } -.futuristic, .futuristic-img { - display: inline-block; - width: 400px; -} +.subHeaders .villas, .outskirts, .blocks { border: #D8D8D8; diff --git a/index.html b/index.html index 6eb664c5d7..bfd9ead7e8 100644 --- a/index.html +++ b/index.html @@ -28,18 +28,19 @@

S&J

-
-
- Integrity,
- Excellence,
- Progress. + +
+ jumboImage +
Integrity,
+
Excellence,
+
Progress.
- -
+ +
-
+

Smith & Jones Architects

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

@@ -47,12 +48,12 @@

Smith & Jones Architects

-
+

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
+
From 684b196d0b6b384ccf1fb3f2084dbdb573de669f Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Mon, 17 Dec 2018 23:52:46 -0500 Subject: [PATCH 12/71] Time to Sleep --- css/index.css | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index 9ac48da7e4..bc0451b7c6 100644 --- a/css/index.css +++ b/css/index.css @@ -138,7 +138,7 @@ table { .container { font-family: Roboto, Arial, sans-serif; font-size: 1.6rem; - max-width: 880px; + max-width: 600px; margin: 0 auto; } .container .jumbotron{ diff --git a/index.html b/index.html index bfd9ead7e8..eae20d6f86 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,7 @@

S&J

- +
jumboImage From a8146a5fdf94a4864d2d661194db63aad0cd48b1 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 10:43:08 -0500 Subject: [PATCH 13/71] Back In Business --- css/index.css | 141 -------------------------------------------------- 1 file changed, 141 deletions(-) diff --git a/css/index.css b/css/index.css index bc0451b7c6..4df28c59af 100644 --- a/css/index.css +++ b/css/index.css @@ -134,144 +134,3 @@ table { border-spacing: 0; } /* Your Code Goes Here */ - -.container { - font-family: Roboto, Arial, sans-serif; - font-size: 1.6rem; - max-width: 600px; - margin: 0 auto; -} -.container .jumbotron{ - position: relative; - text-align:center; -} - -.top-left { - position:absolute; - top: 290px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 24px; - color: #FFFFFF; -} -.center { - position:absolute; - top: 360px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 24px; - color: #FFFFFF; -} -.bottom-left { - position:absolute; - top: 430px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 24px; - color: #FFFFFF; -} - - - -header { - width: 100%; - display: flex; -} - -.jumbotron-text { - font-weight: bold; - font-size: 64px; - line-height: 75px; - /*color: #FFFFFF;*/ -} -#img1, #img2 { - width:350px; - height: 350px; - display:inline-block; -} - -.sNj, nav{ - display: inline-block; - font-size: 20px; - border: 2px dotted cyan; -} - -button { - border: #222222; -} - .main-content-top { - margin: 75px 0 35px 0; - padding: 35px 0; - font-size: 16px; - line-height: 18px; -} - -.main-content-top { - display: flex; - justify-content: space-around; -} -.subHeaders { - display: flex; -} - -.subHeaders - -.villas, .outskirts, .blocks { - border: #D8D8D8; - margin-left: 100px;; -} -p { - display: inline-block; - width: 350px; - font-size: 16px; - line-height: 24px; - border: 3px dashed maroon; -} - -h2 { - font-size:64px; - line-height: 75px; - font-weight: bold; - border: 4px dashed navy; -} -h3 { -font-size: 28px; -font-weight: bold; -color: #222222; -} - -h4 { - font-size: 20px; -} - -.villas , .outskirts , .blocks { - width:350px; - margin-left: 200px; - border: 4px solid gray; -} - - -footer { - background: #828282; - color: #FFFFFF; - font-size: 14px; - line-height: 26px; -} - - -footer h3{ - color: #FFFFFF; -} - -.footer-heading { - font-size: 20px; - line-height: 24px; - color: #FFFFFF; -} - -address { - border: 4px dotted green; -} From 971216605cc3314e8e44541ff0f200e31c29e8d0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 11:05:06 -0500 Subject: [PATCH 14/71] .. --- css/index.css | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/css/index.css b/css/index.css index 4df28c59af..cba8c3a484 100644 --- a/css/index.css +++ b/css/index.css @@ -134,3 +134,48 @@ table { border-spacing: 0; } /* Your Code Goes Here */ + +.container { + max-width: 800px; + margin: 0 auto; + border: 1px solid red; + padding:20px 1.25%; +} +.jumbotron { + position: relative; + text-align: center +} + +.top-left { + position: absolute; + top: 230px; + left:20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; +} +.center { + position: absolute; + top: 300px; + left:20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; +} + +.bottom-left { + position: absolute; + top: 370px; + left:20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; + + + + + + From 8c76a9b89554710ddab0665e382ffdf230aef9a0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 11:31:29 -0500 Subject: [PATCH 15/71] Contact HTML --- contact.html | 95 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/contact.html b/contact.html index 868844fe14..de521e8ac1 100644 --- a/contact.html +++ b/contact.html @@ -14,48 +14,83 @@

Contact

- + +
+

S&J

+ +
+ + + +
+ contactUsImage +
Contact Us
+
-Get In Touch +
+

Get In Touch

-Email Address -Enter Email -We'll never share your email with anyone else. + -How many buildings do you need planned? -1-5 +
+

How many buildings do you need planned?

+ 1-5 +
-Provide a brief overview of your project needs: +
+

Provide a brief overview of your project needs:

+
-I am a small business -I am a residential owner -I am a corporation -Submit +
+I am a small business
+I am a residential owner
+I am a corporation
-Where We Work + +
+
-New York -123 Lane -Suite 100 -Albany, NY 12345 -202 555 0144 +
+

Where We Work

+
+

New York

+ 123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144 +
-Florida -Ocean Drive -Suite 201 -Orlando, FL 22345 -502 555 0144 +
+

Florida

+ Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144 +
-California -Mountain Street -Suite 105 -San Diego, CA 22345 -702 555 0144 +
+

California

+ Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144 +
---> +
+ \ No newline at end of file From beef5ac39085e6c01ef1801b757c037c8800a2bf Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 11:34:20 -0500 Subject: [PATCH 16/71] Redoing S&*T I Forgot to Save Yesterday --- contact.html | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/contact.html b/contact.html index de521e8ac1..ad0c0e2e9a 100644 --- a/contact.html +++ b/contact.html @@ -62,9 +62,18 @@

Email Address

-
-

Where We Work

-
+
+
+

Interested in starting a project?
Let’s talk

+
+
Email:
+
+

We'll never share your email with anyone else.

+
+ +
+ +

New York

123 Lane
Suite 100
@@ -87,8 +96,12 @@

California

San Diego, CA 22345
702 555 0144
+
-
+

Copyright © 2018 Smith and Jones

+ + +
From 6ce91fd4bf925bf97e95830155c1b67739e44672 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 11:52:40 -0500 Subject: [PATCH 17/71] Doing It --- css/index.css | 17 ++++++++++++++++- index.html | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index cba8c3a484..dc9bb6ec11 100644 --- a/css/index.css +++ b/css/index.css @@ -135,13 +135,17 @@ table { } /* Your Code Goes Here */ +* { + box-sizing: border-box; +} + .container { max-width: 800px; margin: 0 auto; border: 1px solid red; padding:20px 1.25%; } -.jumbotron { +.jumbotron, .contactUs { position: relative; text-align: center } @@ -173,6 +177,17 @@ table { font-size: 64px; line-height: 75px; color: #FFFFFF; +} + +.contactUs .bottom-left { + position: absolute; + top: 110px; + left:20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; + diff --git a/index.html b/index.html index eae20d6f86..4856aae85a 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ -
+
From 2f9b07f577e085a9efe2e593bb805306830495ac Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 14:16:19 -0500 Subject: [PATCH 18/71] Editing CSS settings --- contact.html | 2 +- css/index.css | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contact.html b/contact.html index ad0c0e2e9a..9255688d1d 100644 --- a/contact.html +++ b/contact.html @@ -14,7 +14,7 @@

Contact

-
+
diff --git a/css/index.css b/css/index.css index dc9bb6ec11..38fc59ad5f 100644 --- a/css/index.css +++ b/css/index.css @@ -139,8 +139,12 @@ table { box-sizing: border-box; } +html { + font-size: 62.5%; +} + .container { - max-width: 800px; + max-width: 1000px; margin: 0 auto; border: 1px solid red; padding:20px 1.25%; From f03b56189d8ba588b9a31b6d96ac69fa5bec9328 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 14:40:28 -0500 Subject: [PATCH 19/71] .. --- css/index.css | 16 ++++++++++++++++ index.html | 16 ++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/css/index.css b/css/index.css index 38fc59ad5f..c42a418b94 100644 --- a/css/index.css +++ b/css/index.css @@ -149,6 +149,11 @@ html { border: 1px solid red; padding:20px 1.25%; } + +.sNj, nav { + font-size:20px; + +} .jumbotron, .contactUs { position: relative; text-align: center @@ -191,6 +196,17 @@ html { font-size: 64px; line-height: 75px; color: #FFFFFF; +} +p { +font-size: 1.6rem; +line-height: 2.4rem; +} + +h2 { + font-weight: bold; + font-size: 2.8rem; + color: #222222 +} diff --git a/index.html b/index.html index 4856aae85a..5ea22c68f6 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@

S&J

-

Smith & Jones Architects

+

Smith & Jones Architects

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

@@ -50,14 +50,14 @@

Smith & Jones Architects

-

Futuristic Designs

+

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-

Recent Projects

+

Recent Projects

@@ -68,14 +68,14 @@

THE VILLAS

-

OUTSKIRTS

+

OUTSKIRTS

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

THE BLOCKS

+

THE BLOCKS

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.


@@ -95,7 +95,7 @@

Interested in starting a project?
Let’s talk

-

New York

+

New York

123 Lane
Suite 100
Albany, NY 12345
@@ -103,7 +103,7 @@

New York

-

Florida

+

Florida

Ocean Drive
Suite 201
Orlando, FL 22345
@@ -111,7 +111,7 @@

Florida

-

California

+

California

Mountain Street
Suite 105
San Diego, CA 22345
From 26b06e8ffce18e6276a3ee7f85d501e01d25178b Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 14:59:41 -0500 Subject: [PATCH 20/71] More changes --- contact.html | 47 +++++++++++++++++++++++------------------------ css/index.css | 16 ++++++++++++++++ index.html | 15 +++++++-------- 3 files changed, 46 insertions(+), 32 deletions(-) diff --git a/contact.html b/contact.html index 9255688d1d..495a6c7c73 100644 --- a/contact.html +++ b/contact.html @@ -73,30 +73,29 @@

Interested in starting a project?
Let’s talk

-
-

New York

- 123 Lane
- Suite 100
- Albany, NY 12345
- 202 555 0144 -
- -
-

Florida

- Ocean Drive
- Suite 201
- Orlando, FL 22345
- 502 555 0144 -
- -
-

California

- Mountain Street
- Suite 105
- San Diego, CA 22345
- 702 555 0144 -
-
+
+

New York

+

123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144

+
+ +
+

Florida

+

Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144

+
+
+

California

+

Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144

+
+

Copyright © 2018 Smith and Jones

diff --git a/css/index.css b/css/index.css index c42a418b94..ab02c115c9 100644 --- a/css/index.css +++ b/css/index.css @@ -148,6 +148,7 @@ html { margin: 0 auto; border: 1px solid red; padding:20px 1.25%; + font-family: Roboto; } .sNj, nav { @@ -210,6 +211,21 @@ h2 { +footer { + background: #828282; +} + +footer h3 { + font-size: 2rem; + line-height: 2.4rem; + color: #FFFFFF; +} + +footer p { + font-size: 1.4rem; + line-height: 2.6rem; + color: #FFFFFF; +} diff --git a/index.html b/index.html index 5ea22c68f6..3ce05d03ad 100644 --- a/index.html +++ b/index.html @@ -61,7 +61,7 @@

Recent Projects

-

THE VILLAS

+

THE VILLAS

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

@@ -96,26 +96,25 @@

Interested in starting a project?
Let’s talk

New York

- 123 Lane
+

123 Lane
Suite 100
Albany, NY 12345
- 202 555 0144 + 202 555 0144

Florida

- Ocean Drive
+

Ocean Drive
Suite 201
Orlando, FL 22345
- 502 555 0144 + 502 555 0144

-

California

- Mountain Street
+

Mountain Street
Suite 105
San Diego, CA 22345
- 702 555 0144 + 702 555 0144

From fcd1bd1acbc5d789cdd0ec42fccb46396bb4a6b0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 15:53:12 -0500 Subject: [PATCH 21/71] Getting Closer --- css/index.css | 31 +++++++++++++++++++++++++++++++ index.html | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/css/index.css b/css/index.css index ab02c115c9..6f14231f60 100644 --- a/css/index.css +++ b/css/index.css @@ -142,6 +142,10 @@ table { html { font-size: 62.5%; } +header { + display: flex; + justify-content: space-between; +} .container { max-width: 1000px; @@ -151,6 +155,11 @@ html { font-family: Roboto; } +img { + max-width: 100%; + height: auto; +} + .sNj, nav { font-size:20px; @@ -198,9 +207,12 @@ html { line-height: 75px; color: #FFFFFF; } + + p { font-size: 1.6rem; line-height: 2.4rem; +margin: 1rem 0; } h2 { @@ -209,6 +221,25 @@ h2 { color: #222222 } +/* h2 .right-bottom{ + position: absolute; + top: 5px; + right:10px; + font-size: 20px; + line-height: 24px; + background: #828282; + color: #222222; +} +h2 .left-bottom{ + position: absolute; + top: 5px; + right:10px; + font-size: 20px; + line-height: 24px; + background: #828282; + color: #222222; +} */ + footer { diff --git a/index.html b/index.html index 3ce05d03ad..70f62415ed 100644 --- a/index.html +++ b/index.html @@ -61,21 +61,21 @@

Recent Projects

-

THE VILLAS

+

THE VILLAS

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

OUTSKIRTS

+

OUTSKIRTS

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

THE BLOCKS

+

THE BLOCKS

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.


From db54877d6375db856411d97611407cacce8468f0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 17:02:13 -0500 Subject: [PATCH 22/71] .. --- css/index.css | 13 ++++++------- index.html | 5 +++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/css/index.css b/css/index.css index 6f14231f60..258e4926d2 100644 --- a/css/index.css +++ b/css/index.css @@ -155,11 +155,10 @@ header { font-family: Roboto; } -img { - max-width: 100%; - height: auto; -} +.main-content-top1, #smithNjones{ + display: flex; +} .sNj, nav { font-size:20px; @@ -221,7 +220,7 @@ h2 { color: #222222 } -/* h2 .right-bottom{ + /* h2 .right-bottom{ position: absolute; top: 5px; right:10px; @@ -238,8 +237,8 @@ h2 .left-bottom{ line-height: 24px; background: #828282; color: #222222; -} */ - +} */ + footer { diff --git a/index.html b/index.html index 70f62415ed..3c59b3d395 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@

S&J

-
+

Smith & Jones Architects

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

@@ -48,7 +48,7 @@

Smith & Jones Architects

-
+

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

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

THE BLOCKS

Interested in starting a project?
Let’s talk

Email:
+

We'll never share your email with anyone else.

From c41184bc4f2cda1c5b6115706c1dd5204ce1f8b0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Tue, 18 Dec 2018 18:55:49 -0500 Subject: [PATCH 23/71] LESS Styling --- css/index.css | 129 ++---------------------------------------------- index.html | 27 +++++----- less/index.less | 11 +++++ 3 files changed, 30 insertions(+), 137 deletions(-) diff --git a/css/index.css b/css/index.css index 258e4926d2..e6b4c54ee7 100644 --- a/css/index.css +++ b/css/index.css @@ -134,129 +134,6 @@ table { border-spacing: 0; } /* Your Code Goes Here */ - -* { - box-sizing: border-box; -} - -html { - font-size: 62.5%; -} -header { - display: flex; - justify-content: space-between; -} - -.container { - max-width: 1000px; - margin: 0 auto; - border: 1px solid red; - padding:20px 1.25%; - font-family: Roboto; -} - -.main-content-top1, #smithNjones{ - display: flex; - -} -.sNj, nav { - font-size:20px; - -} -.jumbotron, .contactUs { - position: relative; - text-align: center -} - -.top-left { - position: absolute; - top: 230px; - left:20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; -} -.center { - position: absolute; - top: 300px; - left:20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; -} - -.bottom-left { - position: absolute; - top: 370px; - left:20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; -} - -.contactUs .bottom-left { - position: absolute; - top: 110px; - left:20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; -} - - -p { -font-size: 1.6rem; -line-height: 2.4rem; -margin: 1rem 0; -} - -h2 { - font-weight: bold; - font-size: 2.8rem; - color: #222222 -} - - /* h2 .right-bottom{ - position: absolute; - top: 5px; - right:10px; - font-size: 20px; - line-height: 24px; - background: #828282; - color: #222222; -} -h2 .left-bottom{ - position: absolute; - top: 5px; - right:10px; - font-size: 20px; - line-height: 24px; - background: #828282; - color: #222222; -} */ - - - -footer { - background: #828282; -} - -footer h3 { - font-size: 2rem; - line-height: 2.4rem; - color: #FFFFFF; -} - -footer p { - font-size: 1.4rem; - line-height: 2.6rem; - color: #FFFFFF; -} - - - - +/*general styles, jumbotron headers, footer headings & text, nav logo,nav color */ +/*button borders, tab hover background, sub headers, nav text hover color, project button borders*/ +/*Home Page*/ diff --git a/index.html b/index.html index 3c59b3d395..65884299d2 100644 --- a/index.html +++ b/index.html @@ -40,21 +40,26 @@

S&J

-
-

Smith & Jones Architects

+
+

Smith & Jones Architects

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
- - - -
- -

Futuristic Designs

+
+
+ +
+
+ +
+
+ +
+
+

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
-
+
+

Recent Projects

diff --git a/less/index.less b/less/index.less index a7c22b8219..c81b9667c3 100644 --- a/less/index.less +++ b/less/index.less @@ -58,3 +58,14 @@ table{ } /* Your Code Goes Here */ + + + @background: #FFFFFF;/*general styles, jumbotron headers, footer headings & text, nav logo,nav color */ + @color: #222222;/*button borders, tab hover background, sub headers, nav text hover color, project button borders*/ + @font-family: Roboto, Arial, san-serif; + @hover-color: #FFF; + @footer-background: #828282; + @projects-square: #D8D8D8; + + /*Home Page*/ + From 950b579abf8843439d4c791173f24d3f266878a4 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 00:14:14 -0500 Subject: [PATCH 24/71] .. --- css/index.css | 15 ++++++++++++--- less/index.less | 15 +++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/css/index.css b/css/index.css index e6b4c54ee7..52f5da0a43 100644 --- a/css/index.css +++ b/css/index.css @@ -134,6 +134,15 @@ table { border-spacing: 0; } /* Your Code Goes Here */ -/*general styles, jumbotron headers, footer headings & text, nav logo,nav color */ -/*button borders, tab hover background, sub headers, nav text hover color, project button borders*/ -/*Home Page*/ + +* { box-sizing: border-box; +} + +header { + display: flex; + font:Roboto; +} + +.container { + max-width: 880px; +} \ No newline at end of file diff --git a/less/index.less b/less/index.less index c81b9667c3..d279beca7d 100644 --- a/less/index.less +++ b/less/index.less @@ -59,13 +59,12 @@ table{ /* Your Code Goes Here */ +@main-font: Roboto, Arial, sans-serif; +@mineshaft: #222222; +@gray: #828282; +@white: #FFFFFF; +@projects-gray-square: #D8D8D8; +@hover-color: #FFF; - @background: #FFFFFF;/*general styles, jumbotron headers, footer headings & text, nav logo,nav color */ - @color: #222222;/*button borders, tab hover background, sub headers, nav text hover color, project button borders*/ - @font-family: Roboto, Arial, san-serif; - @hover-color: #FFF; - @footer-background: #828282; - @projects-square: #D8D8D8; - - /*Home Page*/ + From 24126a909adc4a2b7c99134813db57538746cfc0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 10:15:38 -0500 Subject: [PATCH 25/71] Back To The Drawing Board --- css/index.css | 12 ------------ less/index.less | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/css/index.css b/css/index.css index 52f5da0a43..4df28c59af 100644 --- a/css/index.css +++ b/css/index.css @@ -134,15 +134,3 @@ table { border-spacing: 0; } /* Your Code Goes Here */ - -* { box-sizing: border-box; -} - -header { - display: flex; - font:Roboto; -} - -.container { - max-width: 880px; -} \ No newline at end of file diff --git a/less/index.less b/less/index.less index d279beca7d..0f335b431f 100644 --- a/less/index.less +++ b/less/index.less @@ -63,8 +63,7 @@ table{ @mineshaft: #222222; @gray: #828282; @white: #FFFFFF; -@projects-gray-square: #D8D8D8; -@hover-color: #FFF; + From 9cb54eb0c825f7ca9fff85dc22679ce5593a28c3 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 11:33:14 -0500 Subject: [PATCH 26/71] LESS compiler not working correctly --- css/index.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/css/index.css b/css/index.css index 4df28c59af..904818eb12 100644 --- a/css/index.css +++ b/css/index.css @@ -134,3 +134,26 @@ table { border-spacing: 0; } /* Your Code Goes Here */ + +* { + box-sizing: border-box; +} + +.container { + width: 880px; + margin: auto; + font-family: Roboto; +} + +/* Header Styles */ + +header { + width: 100%; + display: flex; +} +h2 { + + font-weight: bold; + font-size: 28px; + color:#222222; +} \ No newline at end of file From cbf807f195113d20df45c002fb5dcbc3e94b7d3b Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 12:23:11 -0500 Subject: [PATCH 27/71] Making Progress --- css/index.css | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/css/index.css b/css/index.css index 904818eb12..5ff610a9e2 100644 --- a/css/index.css +++ b/css/index.css @@ -145,15 +145,67 @@ table { font-family: Roboto; } -/* Header Styles */ + header { width: 100%; display: flex; } + +.jumbotron { + position: relative; + text-align: center +} + +.top-left { + position: absolute; + top: 270px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF +} + +.center { + position: absolute; + top: 340px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF +} +.bottom-left { + position: absolute; + top: 410px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; +} + + h2 { font-weight: bold; font-size: 28px; color:#222222; +} + +h3 { + font-size: 20px; + line-height: 24px; + color:#FFFFFF; +} + +footer{ + background: #828282; +} + +footer p { + font-size: 14px; + line-height: 26px; + color: #FFFFFF; } \ No newline at end of file From 863999cd88857e1776bc2433e5dce74600a497c7 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 12:33:56 -0500 Subject: [PATCH 28/71] .. --- css/index.css | 36 +++++++++++++++++++++++++++++++----- index.html | 17 +++++++++-------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/css/index.css b/css/index.css index 5ff610a9e2..a408bba18e 100644 --- a/css/index.css +++ b/css/index.css @@ -147,11 +147,14 @@ table { -header { +header { width: 100%; display: flex; + padding: 10px; } + + .jumbotron { position: relative; text-align: center @@ -186,15 +189,38 @@ header { color: #FFFFFF; } +.subHeaders { + display: flex; + padding: 30px; + justify-content: space-around; +} +.subHeaders img { + width: 350px; +} + +.subHeaders p { + width: 250px; +} + +button { + background: #FFFFFF; +} + -h2 { - +.subHeaders h2, .main-content h2 { font-weight: bold; font-size: 28px; - color:#222222; } -h3 { +.main-content h2 { + font-family: Arial; +} +.main-content h3 { + font-family: Arial; + font-size: 20px; +} + +footer h3 { font-size: 20px; line-height: 24px; color:#FFFFFF; diff --git a/index.html b/index.html index 65884299d2..1432579b28 100644 --- a/index.html +++ b/index.html @@ -59,33 +59,34 @@

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

+ -
-

Recent Projects

- +
+ +

Recent Projects

-

THE VILLAS

+

THE VILLAS

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

OUTSKIRTS

+

OUTSKIRTS

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

THE BLOCKS

+

THE BLOCKS

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.


-
-
+
+
From cc1d3d21f6ec87aa9dc80629304f99224ac18210 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 13:24:04 -0500 Subject: [PATCH 29/71] Commiting and Pushing --- css/index.css | 74 +++++++++++++---------------------- index.html | 52 +++++++++++++----------- less/index.less | 102 ++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 155 insertions(+), 73 deletions(-) diff --git a/css/index.css b/css/index.css index a408bba18e..81abbbbcb0 100644 --- a/css/index.css +++ b/css/index.css @@ -134,84 +134,69 @@ table { border-spacing: 0; } /* Your Code Goes Here */ - * { box-sizing: border-box; } - .container { width: 880px; margin: auto; font-family: Roboto; } - - - -header { +header { width: 100%; display: flex; padding: 10px; } - - - .jumbotron { position: relative; - text-align: center + text-align: center; } - .top-left { position: absolute; - top: 270px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF -} - + top: 270px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; +} .center { position: absolute; - top: 340px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF + top: 340px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; } .bottom-left { position: absolute; - top: 410px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; -} - + top: 410px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; +} .subHeaders { display: flex; padding: 30px; - justify-content: space-around; + justify-content: space-around; } .subHeaders img { width: 350px; } - .subHeaders p { width: 250px; } - button { background: #FFFFFF; } - - -.subHeaders h2, .main-content h2 { +.subHeaders h2, +.main-content h2 { font-weight: bold; font-size: 28px; } - .main-content h2 { font-family: Arial; } @@ -219,19 +204,16 @@ button { font-family: Arial; font-size: 20px; } - footer h3 { font-size: 20px; line-height: 24px; - color:#FFFFFF; + color: #FFFFFF; } - -footer{ +footer { background: #828282; } - footer p { font-size: 14px; line-height: 26px; color: #FFFFFF; -} \ No newline at end of file +} diff --git a/index.html b/index.html index 1432579b28..22d797bc3a 100644 --- a/index.html +++ b/index.html @@ -100,29 +100,35 @@

Interested in starting a project?
Let’s talk

- -
-

New York

-

123 Lane
- Suite 100
- Albany, NY 12345
- 202 555 0144

-
- -
-

Florida

-

Ocean Drive
- Suite 201
- Orlando, FL 22345
- 502 555 0144

-
-
-

California

-

Mountain Street
- Suite 105
- San Diego, CA 22345
- 702 555 0144

-
+
+
+

New York

+

123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144

+
+
+ +
+
+

Florida

+

Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144

+
+
+ +
+
+

California

+

Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144

+
+

Copyright © 2018 Smith and Jones

diff --git a/less/index.less b/less/index.less index 0f335b431f..b4924fb5b3 100644 --- a/less/index.less +++ b/less/index.less @@ -59,11 +59,105 @@ table{ /* Your Code Goes Here */ -@main-font: Roboto, Arial, sans-serif; -@mineshaft: #222222; -@gray: #828282; -@white: #FFFFFF; +* { + box-sizing: border-box; +} + +.container { + width: 880px; + margin: auto; + font-family: Roboto; +} + +header { + width: 100%; + display: flex; + padding: 10px; +} + + + +.jumbotron { + position: relative; + text-align: center +} + +.top-left { + position: absolute; + top: 270px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF +} + +.center { + position: absolute; + top: 340px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF +} +.bottom-left { + position: absolute; + top: 410px; + left: 20px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; +} + +.subHeaders { + display: flex; + padding: 30px; + justify-content: space-around; +} +.subHeaders img { + width: 350px; +} + +.subHeaders p { + width: 250px; +} + +button { + background: #FFFFFF; +} + + +.subHeaders h2, .main-content h2 { + font-weight: bold; + font-size: 28px; +} + +.main-content h2 { + font-family: Arial; +} +.main-content h3 { + font-family: Arial; + font-size: 20px; +} + +footer h3 { + font-size: 20px; + line-height: 24px; + color:#FFFFFF; +} + +footer{ + background: #828282; +} + +footer p { + font-size: 14px; + line-height: 26px; + color: #FFFFFF; +} From 1e3db80f029f62c62655c3e08bccbe2cc1b2f895 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 14:19:19 -0500 Subject: [PATCH 30/71] Adding Dropdown Menu --- css/index.css | 43 +++++++++++++++++++++++++++++++++++++++++++ less/index.less | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/css/index.css b/css/index.css index 81abbbbcb0..91ac2334af 100644 --- a/css/index.css +++ b/css/index.css @@ -147,6 +147,49 @@ header { display: flex; padding: 10px; } +/*Dropdown Content*/ +.dropdown { + z-index: 2; + position: absolute; + right: 75px; + cursor: pointer; +} +.dropdown .dropdown-button { + padding: 15px; + border: 3px solid #ffffff; + color: #ffffff; + font-size: 20px; + font-weight: bold; +} +.dropdown .dropdown-button:hover { + background-color: #be2530; +} +.dropdown .dropdown-content { + width: 100%; + position: absolute; + background-color: #ffffff; + display: flex; + flex-direction: column; + align-items: center; + margin-top: 10px; + border: 2.5px solid #931d25; +} +.dropdown .dropdown-link { + width: 100%; + text-align: center; + padding: 15px 0; + font-size: 18px; + text-decoration: none; + color: #931d25; +} +.dropdown .dropdown-link:hover { + color: #ffffff; + background-color: #931d25; +} +.dropdown .dropdown-hidden { + display: none; +} +/* Dropdown Content End*/ .jumbotron { position: relative; text-align: center; diff --git a/less/index.less b/less/index.less index b4924fb5b3..6b5246392a 100644 --- a/less/index.less +++ b/less/index.less @@ -77,8 +77,52 @@ header { display: flex; padding: 10px; } +/*Dropdown Content*/ +.dropdown { + z-index: 2; + position: absolute; + right: 75px; + cursor: pointer; +} +.dropdown .dropdown-button { + padding: 15px; + border: 3px solid #ffffff; + color: #ffffff; + font-size: 20px; + font-weight: bold; +} +.dropdown .dropdown-button:hover { + background-color: #be2530; +} +.dropdown .dropdown-content { + width: 100%; + position: absolute; + background-color: #ffffff; + display: flex; + flex-direction: column; + align-items: center; + margin-top: 10px; + border: 2.5px solid #931d25; +} +.dropdown .dropdown-link { + width: 100%; + text-align: center; + padding: 15px 0; + font-size: 18px; + text-decoration: none; + color: #931d25; +} +.dropdown .dropdown-link:hover { + color: #ffffff; + background-color: #931d25; +} +.dropdown .dropdown-hidden { + display: none; +} + +/* Dropdown Content End*/ .jumbotron { position: relative; From 7ca079fd78b8ab815626feceab6ac08cc5e7e0b5 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 14:40:12 -0500 Subject: [PATCH 31/71] Main Content Edits --- index.html | 37 +++++++++++++++++++++++++------------ less/index.less | 2 +- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 22d797bc3a..40e4dd9d3e 100644 --- a/index.html +++ b/index.html @@ -20,14 +20,24 @@

S&J

-
-
jumboImage @@ -65,26 +75,29 @@

Futuristic Designs

Recent Projects

-
+
Villas
-

THE VILLAS

+
+

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
+
-
+ +
Outskirts
-

OUTSKIRTS

+
+
Outskirts

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
+
-
+
Blocks
-

THE BLOCKS

+
+

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
diff --git a/less/index.less b/less/index.less index 6b5246392a..2f67dfa522 100644 --- a/less/index.less +++ b/less/index.less @@ -77,8 +77,8 @@ header { display: flex; padding: 10px; } -/*Dropdown Content*/ +/*Dropdown Content*/ .dropdown { z-index: 2; From dd71007dc1438b77c8c84590b4e2f23a437f18ba Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 15:29:49 -0500 Subject: [PATCH 32/71] Feeling Good ! --- css/index.css | 20 +++++++++----------- index.html | 12 ++++++------ less/index.less | 23 +++++++++-------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/css/index.css b/css/index.css index 91ac2334af..a0eaaed7e1 100644 --- a/css/index.css +++ b/css/index.css @@ -145,13 +145,13 @@ table { header { width: 100%; display: flex; - padding: 10px; + padding: 15px; } /*Dropdown Content*/ .dropdown { z-index: 2; position: absolute; - right: 75px; + left: 25px; cursor: pointer; } .dropdown .dropdown-button { @@ -194,7 +194,7 @@ header { position: relative; text-align: center; } -.top-left { +.jumbotron .top-left { position: absolute; top: 270px; left: 20px; @@ -203,7 +203,7 @@ header { line-height: 75px; color: #FFFFFF; } -.center { +.jumbotron .center { position: absolute; top: 340px; left: 20px; @@ -212,7 +212,7 @@ header { line-height: 75px; color: #FFFFFF; } -.bottom-left { +.jumbotron .bottom-left { position: absolute; top: 410px; left: 20px; @@ -240,12 +240,10 @@ button { font-weight: bold; font-size: 28px; } -.main-content h2 { - font-family: Arial; -} -.main-content h3 { - font-family: Arial; - font-size: 20px; +.right-bottom, +.left-bottom { + font-size: 40px; + border: 3px solid red; } footer h3 { font-size: 20px; diff --git a/index.html b/index.html index 40e4dd9d3e..a122a4f6a4 100644 --- a/index.html +++ b/index.html @@ -44,7 +44,7 @@

S&J

Integrity,
Excellence,
Progress.
- + @@ -75,7 +75,7 @@

Futuristic Designs

Recent Projects

-
Villas
+
Villas
@@ -84,18 +84,18 @@

Recent Projects

-
Outskirts
+
Outskirts
-
Outskirts
+

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
Blocks
+
Blocks
-
+

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

diff --git a/less/index.less b/less/index.less index 2f67dfa522..6fca37b9d3 100644 --- a/less/index.less +++ b/less/index.less @@ -70,20 +70,17 @@ table{ font-family: Roboto; } - - header { width: 100%; display: flex; - padding: 10px; + padding: 15px; } /*Dropdown Content*/ - .dropdown { z-index: 2; position: absolute; - right: 75px; + left: 25px; cursor: pointer; } .dropdown .dropdown-button { @@ -122,6 +119,7 @@ header { display: none; } + /* Dropdown Content End*/ .jumbotron { @@ -129,7 +127,7 @@ header { text-align: center } -.top-left { +.jumbotron .top-left { position: absolute; top: 270px; left: 20px; @@ -139,7 +137,7 @@ header { color: #FFFFFF } -.center { +.jumbotron .center { position: absolute; top: 340px; left: 20px; @@ -148,7 +146,7 @@ header { line-height: 75px; color: #FFFFFF } -.bottom-left { +.jumbotron .bottom-left { position: absolute; top: 410px; left: 20px; @@ -181,12 +179,9 @@ button { font-size: 28px; } -.main-content h2 { - font-family: Arial; -} -.main-content h3 { - font-family: Arial; - font-size: 20px; +.right-bottom, .left-bottom { + font-size: 40px; + border: 3px solid red; } footer h3 { From 73a4285cb5dbc17a227bd2b778155162fae71ac8 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 16:50:58 -0500 Subject: [PATCH 33/71] More Edits --- css/index.css | 11 ++++++++++- less/index.less | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index a0eaaed7e1..9652fe8948 100644 --- a/css/index.css +++ b/css/index.css @@ -221,6 +221,13 @@ header { line-height: 75px; color: #FFFFFF; } +.contactUs .bottom-left { + position: absolute; + top: 150px; + font-weight: bold; + font-size: 32px; + color: #FFFFFF; +} .subHeaders { display: flex; padding: 30px; @@ -242,8 +249,10 @@ button { } .right-bottom, .left-bottom { - font-size: 40px; + width: 200px; + font-size: 28px; border: 3px solid red; + background: #D8D8D8; } footer h3 { font-size: 20px; diff --git a/less/index.less b/less/index.less index 6fca37b9d3..dee655beb3 100644 --- a/less/index.less +++ b/less/index.less @@ -156,6 +156,13 @@ header { color: #FFFFFF; } +.contactUs .bottom-left { + position: absolute; + top: 150px; + font-weight: bold; + font-size: 32px; + color: #FFFFFF; +} .subHeaders { display: flex; padding: 30px; @@ -180,8 +187,10 @@ button { } .right-bottom, .left-bottom { - font-size: 40px; + width: 200px; + font-size: 28px; border: 3px solid red; + background: #D8D8D8 } footer h3 { From 71b8c19c569b08bc2603b80fb56485cf379ccb0f Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 17:15:10 -0500 Subject: [PATCH 34/71] .. --- contact.html | 4 ++-- css/index.css | 12 ++++++++++++ index.html | 8 +++----- less/index.less | 12 ++++++++++++ 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/contact.html b/contact.html index 495a6c7c73..e05fb70de4 100644 --- a/contact.html +++ b/contact.html @@ -28,13 +28,13 @@

S&J

- +
contactUsImage
Contact Us
-
+

Get In Touch

@@ -69,7 +68,6 @@

Futuristic Designs

Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
diff --git a/less/index.less b/less/index.less index dee655beb3..4a48088ee1 100644 --- a/less/index.less +++ b/less/index.less @@ -180,6 +180,9 @@ button { background: #FFFFFF; } +.main-content { + align-items: center; +} .subHeaders h2, .main-content h2 { font-weight: bold; @@ -188,10 +191,15 @@ button { .right-bottom, .left-bottom { width: 200px; + font-family: Arial; font-size: 28px; border: 3px solid red; background: #D8D8D8 } +.villas-text, .outskirts-text, .blocks-text { + width: 300px; +} + footer h3 { font-size: 20px; @@ -201,6 +209,9 @@ footer h3 { footer{ background: #828282; + display: flex; + padding: 15px; + height: 200px; } footer p { @@ -209,3 +220,4 @@ footer p { color: #FFFFFF; } + From 42cbf556b484be1f35b1378afec9c60497a86a32 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 17:29:48 -0500 Subject: [PATCH 35/71] Deleted extra div's --- css/index.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/index.css b/css/index.css index 86ca034841..4ecbd46de5 100644 --- a/css/index.css +++ b/css/index.css @@ -243,7 +243,8 @@ button { background: #FFFFFF; } .main-content { - align-items: center; + justify-content: center; + border: 2px dashed cyan; } .subHeaders h2, .main-content h2 { From debe053568fab372ca8fe9e00fba425685fa3122 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 17:47:08 -0500 Subject: [PATCH 36/71] .. --- css/index.css | 20 +++++++++++--------- index.html | 25 +++++-------------------- less/index.less | 23 ++++++++++++++++------- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/css/index.css b/css/index.css index 4ecbd46de5..e751a899f2 100644 --- a/css/index.css +++ b/css/index.css @@ -233,6 +233,10 @@ header { padding: 30px; justify-content: space-around; } +.subHeaders h2 { + font-size: 24px; + font-weight: bold; +} .subHeaders img { width: 350px; } @@ -244,25 +248,23 @@ button { } .main-content { justify-content: center; - border: 2px dashed cyan; } -.subHeaders h2, .main-content h2 { font-weight: bold; font-size: 28px; } .right-bottom, .left-bottom { - width: 200px; - font-family: Arial; + width: 250px; + height: 75px; font-size: 28px; - border: 3px solid red; - background: #D8D8D8; + font-weight: bold; + position: absolute; + border: 4px solid purple; } -.villas-text, -.outskirts-text, -.blocks-text { +.main-content p { width: 300px; + justify-content: center; } footer h3 { font-size: 20px; diff --git a/index.html b/index.html index 06b8816c13..08f24d3598 100644 --- a/index.html +++ b/index.html @@ -20,13 +20,6 @@

S&J

- - -
Dropdown
@@ -46,11 +39,9 @@

S&J

- -
-

Smith & Jones Architects

+

Smith & Jones Architects


Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

@@ -64,27 +55,23 @@

Smith & Jones Architects

-

Futuristic Designs

+

Futuristic Designs


Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

-
- -

Recent Projects

+
+

Recent Projects

Villas
-

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-
Outskirts
-

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

@@ -92,14 +79,12 @@

Recent Projects

Blocks
-

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

-

Interested in starting a project?
Let’s talk

@@ -146,6 +131,6 @@

California

- + \ No newline at end of file diff --git a/less/index.less b/less/index.less index 4a48088ee1..37c7858468 100644 --- a/less/index.less +++ b/less/index.less @@ -168,6 +168,11 @@ header { padding: 30px; justify-content: space-around; } + +.subHeaders h2 { + font-size: 24px; + font-weight: bold; +} .subHeaders img { width: 350px; } @@ -181,23 +186,27 @@ button { } .main-content { - align-items: center; + justify-content: center; } -.subHeaders h2, .main-content h2 { +.main-content h2 { font-weight: bold; font-size: 28px; } .right-bottom, .left-bottom { - width: 200px; - font-family: Arial; + width: 250px; + height: 75px; font-size: 28px; - border: 3px solid red; - background: #D8D8D8 + font-weight: bold; + position: absolute; + border: 4px solid purple; + + } -.villas-text, .outskirts-text, .blocks-text { +.main-content p{ width: 300px; + justify-content: center; } From b427c3b1cb7a57936beea91aaa80d7e5d4f00f06 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 18:49:31 -0500 Subject: [PATCH 37/71] Update --- contact.html | 79 ++++++++++++++++++++++++------------------------- css/index.css | 27 +++++++++-------- index.html | 4 +-- less/index.less | 31 +++++++++---------- 4 files changed, 69 insertions(+), 72 deletions(-) diff --git a/contact.html b/contact.html index e05fb70de4..71967c3c44 100644 --- a/contact.html +++ b/contact.html @@ -12,20 +12,14 @@ -

Contact

-

S&J

- -
+ +
@@ -63,46 +57,49 @@

Email Address

-
+

Interested in starting a project?
Let’s talk

Email:
+

We'll never share your email with anyone else.

-
- -
- -
-

New York

-

123 Lane
- Suite 100
- Albany, NY 12345
- 202 555 0144

-
- -
-

Florida

-

Ocean Drive
- Suite 201
- Orlando, FL 22345
- 502 555 0144

-
-
-

California

-

Mountain Street
- Suite 105
- San Diego, CA 22345
- 702 555 0144

-
-
- +
+ +
+
+

New York

+

123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144

+
+
+ +
+
+

Florida

+

Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144

+
+
+ +
+
+

California

+

Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144

+
+
+

Copyright © 2018 Smith and Jones

- +
- - - + \ No newline at end of file diff --git a/css/index.css b/css/index.css index e751a899f2..31667ff39b 100644 --- a/css/index.css +++ b/css/index.css @@ -221,13 +221,6 @@ header { line-height: 75px; color: #FFFFFF; } -.contactUs .bottom-left { - position: absolute; - top: 150px; - font-weight: bold; - font-size: 32px; - color: #FFFFFF; -} .subHeaders { display: flex; padding: 30px; @@ -266,19 +259,27 @@ button { width: 300px; justify-content: center; } +footer div { + justify-content: center; + background: #828282; + padding: 5px; + height: 200px; +} footer h3 { font-size: 20px; line-height: 24px; color: #FFFFFF; } -footer { - background: #828282; - display: flex; - padding: 15px; - height: 200px; -} footer p { font-size: 14px; line-height: 26px; color: #FFFFFF; } +/* Contact Page*/ +.contactUs .bottom-left { + position: absolute; + top: 150px; + font-weight: bold; + font-size: 32px; + color: #FFFFFF; +} diff --git a/index.html b/index.html index 08f24d3598..cba19660ab 100644 --- a/index.html +++ b/index.html @@ -93,9 +93,8 @@

Interested in starting a project?
Let’s talk

We'll never share your email with anyone else.

- + -

New York

@@ -125,7 +124,6 @@

California

702 555 0144

-

Copyright © 2018 Smith and Jones

diff --git a/less/index.less b/less/index.less index 37c7858468..d03a28335d 100644 --- a/less/index.less +++ b/less/index.less @@ -156,13 +156,6 @@ header { color: #FFFFFF; } -.contactUs .bottom-left { - position: absolute; - top: 150px; - font-weight: bold; - font-size: 32px; - color: #FFFFFF; -} .subHeaders { display: flex; padding: 30px; @@ -209,20 +202,19 @@ button { justify-content: center; } +footer div{ + + justify-content: center; + background: #828282; + padding: 5px; + height: 200px; +} footer h3 { font-size: 20px; line-height: 24px; color:#FFFFFF; } - -footer{ - background: #828282; - display: flex; - padding: 15px; - height: 200px; -} - footer p { font-size: 14px; line-height: 26px; @@ -230,3 +222,12 @@ footer p { } + +/* Contact Page*/ +.contactUs .bottom-left { + position: absolute; + top: 150px; + font-weight: bold; + font-size: 32px; + color: #FFFFFF; +} \ No newline at end of file From 3b19462f9f735c7becdb5c01ecbd6450fd389c40 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 19:05:45 -0500 Subject: [PATCH 38/71] Undoing some unnecessary changes --- css/index.css | 39 +++++---- index.html | 4 +- less/index.less | 218 ++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 198 insertions(+), 63 deletions(-) diff --git a/css/index.css b/css/index.css index 31667ff39b..244e493abd 100644 --- a/css/index.css +++ b/css/index.css @@ -221,15 +221,18 @@ header { line-height: 75px; color: #FFFFFF; } +.contactUs .bottom-left { + position: absolute; + top: 150px; + font-weight: bold; + font-size: 32px; + color: #FFFFFF; +} .subHeaders { display: flex; padding: 30px; justify-content: space-around; } -.subHeaders h2 { - font-size: 24px; - font-weight: bold; -} .subHeaders img { width: 350px; } @@ -241,35 +244,37 @@ button { } .main-content { justify-content: center; + border: 2px dashed cyan; } +.subHeaders h2, .main-content h2 { font-weight: bold; font-size: 28px; } .right-bottom, .left-bottom { - width: 250px; - height: 75px; + width: 200px; + font-family: Arial; font-size: 28px; - font-weight: bold; - position: absolute; - border: 4px solid purple; + border: 3px solid red; + background: #D8D8D8; } -.main-content p { +.villas-text, +.outskirts-text, +.blocks-text { width: 300px; - justify-content: center; -} -footer div { - justify-content: center; - background: #828282; - padding: 5px; - height: 200px; } footer h3 { font-size: 20px; line-height: 24px; color: #FFFFFF; } +footer { + background: #828282; + display: flex; + padding: 15px; + height: 200px; +} footer p { font-size: 14px; line-height: 26px; diff --git a/index.html b/index.html index cba19660ab..f289b9c490 100644 --- a/index.html +++ b/index.html @@ -124,11 +124,11 @@

California

702 555 0144

- +

Copyright © 2018 Smith and Jones

- + \ No newline at end of file diff --git a/less/index.less b/less/index.less index d03a28335d..192312893a 100644 --- a/less/index.less +++ b/less/index.less @@ -59,168 +59,298 @@ table{ /* Your Code Goes Here */ - + * { + box-sizing: border-box; + } .container { + width: 880px; + margin: auto; + font-family: Roboto; + } -header { +header { + width: 100%; + display: flex; + padding: 15px; + } /*Dropdown Content*/ + .dropdown { + z-index: 2; + position: absolute; + left: 25px; + cursor: pointer; + } + .dropdown .dropdown-button { + padding: 15px; + border: 3px solid #ffffff; + color: #ffffff; + font-size: 20px; + font-weight: bold; + } + .dropdown .dropdown-button:hover { + background-color: #be2530; + } + .dropdown .dropdown-content { + width: 100%; + position: absolute; + background-color: #ffffff; + display: flex; + flex-direction: column; + align-items: center; + margin-top: 10px; + border: 2.5px solid #931d25; + } + .dropdown .dropdown-link { + width: 100%; + text-align: center; + padding: 15px 0; + font-size: 18px; + text-decoration: none; + color: #931d25; + } + .dropdown .dropdown-link:hover { + color: #ffffff; + background-color: #931d25; + } + .dropdown .dropdown-hidden { + display: none; -} +} /* Dropdown Content End*/ .jumbotron { + position: relative; - text-align: center + + text-align: center; + } .jumbotron .top-left { + position: absolute; - top: 270px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF + + top: 270px; + + left: 20px; + + font-weight: bold; + + font-size: 64px; + + line-height: 75px; + + color: #FFFFFF; + } .jumbotron .center { + position: absolute; - top: 340px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF + + top: 340px; + + left: 20px; + + font-weight: bold; + + font-size: 64px; + + line-height: 75px; + + color: #FFFFFF; + } + .jumbotron .bottom-left { + position: absolute; - top: 410px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; + + top: 410px; + + left: 20px; + + font-weight: bold; + + font-size: 64px; + + line-height: 75px; + + color: #FFFFFF; + +} + +.contactUs .bottom-left { + + position: absolute; + + top: 150px; + + font-weight: bold; + + font-size: 32px; + + color: #FFFFFF; + } .subHeaders { + display: flex; + padding: 30px; - justify-content: space-around; -} -.subHeaders h2 { - font-size: 24px; - font-weight: bold; + justify-content: space-around; + } + .subHeaders img { + width: 350px; + } .subHeaders p { + width: 250px; + } button { + background: #FFFFFF; + } .main-content { + justify-content: center; + + border: 2px dashed cyan; + } +.subHeaders h2, + .main-content h2 { + font-weight: bold; + font-size: 28px; + } -.right-bottom, .left-bottom { - width: 250px; - height: 75px; +.right-bottom, + +.left-bottom { + + width: 200px; + + font-family: Arial; + font-size: 28px; - font-weight: bold; - position: absolute; - border: 4px solid purple; + border: 3px solid red; + + background: #D8D8D8; -} -.main-content p{ - width: 300px; - justify-content: center; } -footer div{ +.villas-text, + +.outskirts-text, + +.blocks-text { + + width: 300px; - justify-content: center; - background: #828282; - padding: 5px; - height: 200px; } footer h3 { + font-size: 20px; + line-height: 24px; - color:#FFFFFF; + + color: #FFFFFF; + +} + +footer { + + background: #828282; + + display: flex; + + padding: 15px; + + height: 200px; + } + footer p { + font-size: 14px; + line-height: 26px; + color: #FFFFFF; + } - /* Contact Page*/ From c28ab6b5f9a9f35fcad89f841ad675b879a15c1c Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Wed, 19 Dec 2018 19:08:45 -0500 Subject: [PATCH 39/71] .. --- less/index.less | 127 ++---------------------------------------------- 1 file changed, 3 insertions(+), 124 deletions(-) diff --git a/less/index.less b/less/index.less index 192312893a..7d81125ad2 100644 --- a/less/index.less +++ b/less/index.less @@ -61,27 +61,18 @@ table{ * { - box-sizing: border-box; - } .container { - width: 880px; - margin: auto; - font-family: Roboto; - } header { - width: 100%; - display: flex; - padding: 15px; } @@ -89,267 +80,155 @@ header { /*Dropdown Content*/ .dropdown { - z-index: 2; - position: absolute; - left: 25px; - cursor: pointer; - } .dropdown .dropdown-button { - padding: 15px; - border: 3px solid #ffffff; - color: #ffffff; - font-size: 20px; - font-weight: bold; - } .dropdown .dropdown-button:hover { - background-color: #be2530; - } .dropdown .dropdown-content { - width: 100%; - position: absolute; - background-color: #ffffff; - display: flex; - flex-direction: column; - align-items: center; - margin-top: 10px; - border: 2.5px solid #931d25; - } .dropdown .dropdown-link { - width: 100%; - text-align: center; - padding: 15px 0; - font-size: 18px; - text-decoration: none; - color: #931d25; - } .dropdown .dropdown-link:hover { - color: #ffffff; - background-color: #931d25; - } .dropdown .dropdown-hidden { - display: none; - } /* Dropdown Content End*/ .jumbotron { - position: relative; - text-align: center; - } .jumbotron .top-left { - position: absolute; - top: 270px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; - } .jumbotron .center { - position: absolute; - top: 340px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; - } .jumbotron .bottom-left { - position: absolute; - top: 410px; - left: 20px; - font-weight: bold; - font-size: 64px; - line-height: 75px; - color: #FFFFFF; - } .contactUs .bottom-left { - position: absolute; - top: 150px; - font-weight: bold; - font-size: 32px; - color: #FFFFFF; - } .subHeaders { - display: flex; - padding: 30px; - justify-content: space-around; - } .subHeaders img { - width: 350px; - } .subHeaders p { - width: 250px; - } button { - background: #FFFFFF; - } .main-content { - justify-content: center; - border: 2px dashed cyan; - } -.subHeaders h2, - -.main-content h2 { - +.subHeaders h2, .main-content h2 { font-weight: bold; - font-size: 28px; - } -.right-bottom, - -.left-bottom { - +.right-bottom, .left-bottom { width: 200px; - font-family: Arial; - font-size: 28px; - border: 3px solid red; - background: #D8D8D8; - } -.villas-text, - -.outskirts-text, - -.blocks-text { - +.villas-text, .outskirts-text, .blocks-text { width: 300px; - } footer h3 { - font-size: 20px; - line-height: 24px; - color: #FFFFFF; - } footer { - background: #828282; - display: flex; - padding: 15px; - height: 200px; - } footer p { - font-size: 14px; - line-height: 26px; - color: #FFFFFF; - } From bf7d09ee5645feca4848835866a98ee69cc0b432 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 05:42:36 -0500 Subject: [PATCH 40/71] Early Riser making Waves --- contact.html | 38 +++++++++++++++++++++++++------------- css/index.css | 3 +++ index.html | 8 +++++--- less/index.less | 17 +++-------------- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/contact.html b/contact.html index 71967c3c44..3ed7777c22 100644 --- a/contact.html +++ b/contact.html @@ -16,10 +16,10 @@ -
+

S&J

- +
@@ -31,28 +31,40 @@

S&J

Get In Touch

+ -
+

How many buildings do you need planned?

- 1-5 +
+ +

Provide a brief overview of your project needs:

-
- - -
-I am a small business
-I am a residential owner
-I am a corporation
- - +
+ Description :
+ +
+
+
+ I am a small business
+ I am a residential owner
+ I am a corporation
+
diff --git a/css/index.css b/css/index.css index 244e493abd..8438266cdd 100644 --- a/css/index.css +++ b/css/index.css @@ -147,6 +147,9 @@ header { display: flex; padding: 15px; } +.top-bar { + background: #D8D8D8; +} /*Dropdown Content*/ .dropdown { z-index: 2; diff --git a/index.html b/index.html index f289b9c490..0a3a3e6404 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,8 @@
-

S&J

+
+ S&J
Dropdown
@@ -28,6 +29,7 @@

S&J

Contact
+
@@ -124,9 +126,9 @@

California

702 555 0144

- -

Copyright © 2018 Smith and Jones

+

Copyright © 2018 Smith and Jones

+ diff --git a/less/index.less b/less/index.less index 7d81125ad2..be3f53fdf3 100644 --- a/less/index.less +++ b/less/index.less @@ -74,7 +74,10 @@ header { width: 100%; display: flex; padding: 15px; +} +.top-bar { + background: #D8D8D8 } /*Dropdown Content*/ @@ -164,13 +167,6 @@ header { color: #FFFFFF; } -.contactUs .bottom-left { - position: absolute; - top: 150px; - font-weight: bold; - font-size: 32px; - color: #FFFFFF; -} .subHeaders { display: flex; @@ -233,10 +229,3 @@ footer p { /* Contact Page*/ -.contactUs .bottom-left { - position: absolute; - top: 150px; - font-weight: bold; - font-size: 32px; - color: #FFFFFF; -} \ No newline at end of file From 96d792a1620c323d41f3e0407245007648d1c0cb Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 10:05:43 -0500 Subject: [PATCH 41/71] Staring On Services Page --- contact.html | 120 ++++++++++++++++++++++++++++++++++-------------- less/index.less | 11 +++-- services.html | 13 +++++- 3 files changed, 104 insertions(+), 40 deletions(-) diff --git a/contact.html b/contact.html index 3ed7777c22..13172c36b0 100644 --- a/contact.html +++ b/contact.html @@ -18,6 +18,14 @@

S&J

+
+
Dropdown
+
+ Home + Services + Contact +
+
@@ -27,52 +35,94 @@

S&J

contactUsImage
Contact Us
- -
-

Get In Touch

+
- -
-

How many buildings do you need planned?

-
- -
-
+
+
+

Where We Work

+ +
+
+

New York

+

123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144

+
+
+ +
+
+

Florida

+

Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144

+
+
+ +
+
+

California

+

Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144

+
+
+
+
-
-

Provide a brief overview of your project needs:

-
- Description :
- -
-
- I am a small business
- I am a residential owner
- I am a corporation
- -
- +

Interested in starting a project?
Let’s talk

-
Email:
+
Email:

We'll never share your email with anyone else.

diff --git a/less/index.less b/less/index.less index be3f53fdf3..6178f0e55a 100644 --- a/less/index.less +++ b/less/index.less @@ -69,7 +69,6 @@ table{ margin: auto; font-family: Roboto; } - header { width: 100%; display: flex; @@ -83,16 +82,15 @@ header { /*Dropdown Content*/ .dropdown { - z-index: 2; position: absolute; - left: 25px; + right: 25px; cursor: pointer; } .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #ffffff; + color:#FFFFFF; font-size: 20px; font-weight: bold; } @@ -191,6 +189,7 @@ button { border: 2px dashed cyan; } + .subHeaders h2, .main-content h2 { font-weight: bold; font-size: 28px; @@ -229,3 +228,7 @@ footer p { /* Contact Page*/ + +.getInTouch h2{ + font-size: 40px; +} \ No newline at end of file diff --git a/services.html b/services.html index fb5a79e18a..f6e11efa7c 100644 --- a/services.html +++ b/services.html @@ -15,7 +15,18 @@

Services

From 92fb82bd0c849ddd1592c2e099ccce186f3489c7 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 10:39:56 -0500 Subject: [PATCH 42/71] Working Hard --- contact.html | 1 - css/index.css | 67 ++++++++++++++++++++------- index.html | 4 +- less/index.less | 58 +++++++++++++++++++++-- services.html | 119 +++++++++++++++++++++++++++++++++++++++++------- 5 files changed, 207 insertions(+), 42 deletions(-) diff --git a/contact.html b/contact.html index 13172c36b0..5b4725e309 100644 --- a/contact.html +++ b/contact.html @@ -26,7 +26,6 @@

S&J

Contact
-
diff --git a/css/index.css b/css/index.css index 8438266cdd..d0a5f91bc2 100644 --- a/css/index.css +++ b/css/index.css @@ -147,20 +147,16 @@ header { display: flex; padding: 15px; } -.top-bar { - background: #D8D8D8; -} /*Dropdown Content*/ .dropdown { - z-index: 2; position: absolute; - left: 25px; + right: 25px; cursor: pointer; } .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #ffffff; + color: #FFFFFF; font-size: 20px; font-weight: bold; } @@ -224,13 +220,6 @@ header { line-height: 75px; color: #FFFFFF; } -.contactUs .bottom-left { - position: absolute; - top: 150px; - font-weight: bold; - font-size: 32px; - color: #FFFFFF; -} .subHeaders { display: flex; padding: 30px; @@ -284,10 +273,54 @@ footer p { color: #FFFFFF; } /* Contact Page*/ -.contactUs .bottom-left { +/*Services Page*/ +.services-heading .center { position: absolute; - top: 150px; font-weight: bold; - font-size: 32px; - color: #FFFFFF; +} +.tabs { + width: 100%; +} +.tabs .tabs-items { + width: 100%; + height: 300px; + display: flex; + justify-content: center; + padding-top: 60px; +} +.tabs .tabs-item { + display: none; + width: 75%; +} +.tabs .tabs-item .tabs-item-title { + font-size: 24px; + font-weight: bold; + padding-bottom: 10px; +} +.tabs .tabs-item-selected { + display: block; +} +.tabs .tabs-links { + display: flex; + background-color: #931d25; +} +.tabs .tabs-link { + padding: 20px 25px; + font-size: 24px; + background-color: #931d25; + border-right: 1px solid white; + color: #ffffff; + cursor: pointer; +} +.tabs .tabs-link:hover { + background-color: #be2530; +} +.tabs .tabs-link-selected { + z-index: 2; + border-right: 1px solid #931d25; + background-color: #ffffff; + color: black; +} +.tabs .tabs-link-selected:hover { + background-color: #ffffff; } diff --git a/index.html b/index.html index 0a3a3e6404..91fe44fd4e 100644 --- a/index.html +++ b/index.html @@ -19,8 +19,7 @@
-
- S&J +

S&J

Dropdown
@@ -29,7 +28,6 @@ Contact
-

diff --git a/less/index.less b/less/index.less index 6178f0e55a..322cd57d0f 100644 --- a/less/index.less +++ b/less/index.less @@ -75,9 +75,6 @@ header { padding: 15px; } -.top-bar { - background: #D8D8D8 -} /*Dropdown Content*/ @@ -229,6 +226,57 @@ footer p { /* Contact Page*/ -.getInTouch h2{ - font-size: 40px; + +/*Services Page*/ + +.services-heading .center { + position: absolute; + font-weight: bold; +} + +.tabs { + width: 100%; +} +.tabs .tabs-items { + width: 100%; + height: 300px; + display: flex; + justify-content: center; + padding-top: 60px; +} +.tabs .tabs-item { + display: none; + width: 75%; +} +.tabs .tabs-item .tabs-item-title { + font-size: 24px; + font-weight: bold; + padding-bottom: 10px; +} +.tabs .tabs-item-selected { + display: block; +} +.tabs .tabs-links { + display: flex; + background-color: #931d25; +} +.tabs .tabs-link { + padding: 20px 25px; + font-size: 24px; + background-color: #931d25; + border-right: 1px solid white; + color: #ffffff; + cursor: pointer; +} +.tabs .tabs-link:hover { + background-color: #be2530; +} +.tabs .tabs-link-selected { + z-index: 2; + border-right: 1px solid #931d25; + background-color: #ffffff; + color: black; +} +.tabs .tabs-link-selected:hover { + background-color: #ffffff; } \ No newline at end of file diff --git a/services.html b/services.html index f6e11efa7c..69eaf5a805 100644 --- a/services.html +++ b/services.html @@ -12,22 +12,30 @@ -

Services

- - + +
+

S&J

+
+
Dropdown
+
+ Home + Services + Contact +
+
+ +

+ +
+ servicesImage +
Services
- + + + @@ -40,10 +48,89 @@

Smith & Jones Architects


Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +--> +
+
+
+
Pre-Construction
+
Construction
+
Design Build
+
Sustainability
+
+
+
+
Quote 1
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+
+
Quote 2
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+
+
Quote 3
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+
+
Quote 4
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+
+
+
+
+
+

Interested in starting a project?
Let’s talk

+
+
Email:
+ +
+

We'll never share your email with anyone else.

+
---> +
+
+

New York

+

123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144

+
+
+ +
+
+

Florida

+

Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144

+
+
+
+
+

California

+

Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144

+
+
+ +

Copyright © 2018 Smith and Jones

+
+ + + \ No newline at end of file From 6eea6bc1e0e7eedcb65e7c4b808a22fb183e6ff2 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 10:55:15 -0500 Subject: [PATCH 43/71] Services Tabs Working --- js/index.js | 42 +++++++++++++++++++++++++++++++++++++++++- services.html | 16 ++++++++-------- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/js/index.js b/js/index.js index bb3d341cf0..5230604579 100644 --- a/js/index.js +++ b/js/index.js @@ -1 +1,41 @@ -// JS goes here \ No newline at end of file +// JS goes here + + +//Service page +class TabLink { + constructor(element) { + this.element = element; + this.data = this.element.dataset.tab; + this.item = document.querySelector(`.tabs-item[data-tab="${this.data}"]`); + this.tabItem = new TabItem(this.item); + this.element.addEventListener("click", () => { + this.select() + }) + }; + + select() { + const links = document.querySelectorAll(".tabs-link"); + links.forEach( link => { + link.classList.remove('tabs-link-selected') + }); + this.element.classList.add('tabs-link-selected'); + this.tabItem.select(); + } + } + + class TabItem { + constructor(element) { + this.element = element; + } + + select() { + const items = document.querySelectorAll('.tabs-item'); + items.forEach( item => { + item.classList.remove('tabs-item-selected'); + }) + this.element.classList.add('tabs-item-selected') + } + } + + const links = document.querySelectorAll(".tabs-link"); + links.forEach(link => new TabLink(link)) \ No newline at end of file diff --git a/services.html b/services.html index 69eaf5a805..4b666f0e42 100644 --- a/services.html +++ b/services.html @@ -58,28 +58,28 @@

S&J

Sustainability
-
-
Quote 1
-
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
Quote 1
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
-
Quote 2
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. + Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities.
Quote 3
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. + Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities.
Quote 4
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. + Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities.
From 02108a62c00da3547ed1a5bf6f6774724ad17f6d Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 11:47:36 -0500 Subject: [PATCH 44/71] Working on Services Cards Setup --- css/index.css | 22 ++--- less/index.less | 34 ++++---- services.html | 227 ++++++++++++++++++++++++++---------------------- 3 files changed, 148 insertions(+), 135 deletions(-) diff --git a/css/index.css b/css/index.css index d0a5f91bc2..bd15c18ba4 100644 --- a/css/index.css +++ b/css/index.css @@ -149,14 +149,15 @@ header { } /*Dropdown Content*/ .dropdown { + z-index: 2; position: absolute; - right: 25px; + left: 25px; cursor: pointer; } .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #FFFFFF; + color: #ffffff; font-size: 20px; font-weight: bold; } @@ -302,25 +303,26 @@ footer p { } .tabs .tabs-links { display: flex; - background-color: #931d25; } .tabs .tabs-link { padding: 20px 25px; font-size: 24px; - background-color: #931d25; - border-right: 1px solid white; - color: #ffffff; + border: 1px solid #5E9F89; + border-right: 1px solid #5E9F89; cursor: pointer; } .tabs .tabs-link:hover { - background-color: #be2530; + background-color: #5E9F89; } .tabs .tabs-link-selected { z-index: 2; - border-right: 1px solid #931d25; - background-color: #ffffff; + border-right: 1px solid #5E9F89; + background-color: #5E9F89; color: black; } .tabs .tabs-link-selected:hover { - background-color: #ffffff; + background-color: #5E9F89; +} +.container #services { + border: 3px dashed purple; } diff --git a/less/index.less b/less/index.less index 322cd57d0f..54e5039fe8 100644 --- a/less/index.less +++ b/less/index.less @@ -79,23 +79,21 @@ header { /*Dropdown Content*/ .dropdown { + z-index: 2; position: absolute; - right: 25px; + left: 25px; cursor: pointer; } - .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color:#FFFFFF; + color: #ffffff; font-size: 20px; font-weight: bold; } - .dropdown .dropdown-button:hover { background-color: #be2530; } - .dropdown .dropdown-content { width: 100%; position: absolute; @@ -106,7 +104,6 @@ header { margin-top: 10px; border: 2.5px solid #931d25; } - .dropdown .dropdown-link { width: 100%; text-align: center; @@ -115,12 +112,10 @@ header { text-decoration: none; color: #931d25; } - .dropdown .dropdown-link:hover { color: #ffffff; background-color: #931d25; } - .dropdown .dropdown-hidden { display: none; } @@ -162,7 +157,6 @@ header { color: #FFFFFF; } - .subHeaders { display: flex; padding: 30px; @@ -254,29 +248,31 @@ footer p { padding-bottom: 10px; } .tabs .tabs-item-selected { - display: block; -} + display: block; + } .tabs .tabs-links { display: flex; - background-color: #931d25; + } .tabs .tabs-link { padding: 20px 25px; font-size: 24px; - background-color: #931d25; - border-right: 1px solid white; - color: #ffffff; + border: 1px solid #5E9F89; + border-right: 1px solid #5E9F89; cursor: pointer; } .tabs .tabs-link:hover { - background-color: #be2530; + background-color:#5E9F89; } .tabs .tabs-link-selected { z-index: 2; - border-right: 1px solid #931d25; - background-color: #ffffff; + border-right: 1px solid #5E9F89; + background-color:#5E9F89; color: black; } .tabs .tabs-link-selected:hover { - background-color: #ffffff; + background-color: #5E9F89; +} +.container #services { + border: 3px dashed purple; } \ No newline at end of file diff --git a/services.html b/services.html index 4b666f0e42..1e427802f3 100644 --- a/services.html +++ b/services.html @@ -12,125 +12,140 @@ -
+
-

S&J

-
-
Dropdown
-
- Home - Services - Contact +

S&J

+
+
Dropdown
+
+ Home + Services + Contact +
-

- -

- -
- servicesImage -
Services
-
- - - - - -
-
-
-
Pre-Construction
-
Construction
-
Design Build
-
Sustainability
-
-
-
-
Quote 1
+ + + +
+ servicesImage +
Services
+
+ + + + + +
+
+
+
Pre-Construction
+
Construction
+
Design Build
+
Sustainability
+
+
+
+
+
Pre-Construction
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+ +
+ +
+
+
Construction
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. + Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+
-
-
Quote 2
-
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. -
-
-
-
Quote 3
-
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
Design Build
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+ +
-
-
-
Quote 4
-
- Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
Sustainability
+
+ Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. +
+
+ +
-
- -
-
-

Interested in starting a project?
Let’s talk

-
-
Email:
- -
-

We'll never share your email with anyone else.

-
- -
-
-

New York

-

123 Lane
- Suite 100
- Albany, NY 12345
- 202 555 0144

-
-
- -
-
-

Florida

-

Ocean Drive
- Suite 201
- Orlando, FL 22345
- 502 555 0144

-
-
- -
-
-

California

-

Mountain Street
- Suite 105
- San Diego, CA 22345
- 702 555 0144

-
+ + +
+
+

Interested in starting a project?
Let’s talk

+
+
Email:
+ +
+

We'll never share your email with anyone else.

+
+ +
+
+

New York

+

123 Lane
+ Suite 100
+ Albany, NY 12345
+ 202 555 0144

+
+
+ +
+
+

Florida

+

Ocean Drive
+ Suite 201
+ Orlando, FL 22345
+ 502 555 0144

+
+
+ +
+
+

California

+

Mountain Street
+ Suite 105
+ San Diego, CA 22345
+ 702 555 0144

+
+
+ +

Copyright © 2018 Smith and Jones

+
+ + +
- -

Copyright © 2018 Smith and Jones

-
- - -
- \ No newline at end of file From 5dcf9d7d61456b858b3b2ef40d7db10a153a8704 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 11:52:46 -0500 Subject: [PATCH 45/71] .. --- css/index.css | 3 --- less/index.less | 3 --- 2 files changed, 6 deletions(-) diff --git a/css/index.css b/css/index.css index bd15c18ba4..432a2a449f 100644 --- a/css/index.css +++ b/css/index.css @@ -323,6 +323,3 @@ footer p { .tabs .tabs-link-selected:hover { background-color: #5E9F89; } -.container #services { - border: 3px dashed purple; -} diff --git a/less/index.less b/less/index.less index 54e5039fe8..0777c0545e 100644 --- a/less/index.less +++ b/less/index.less @@ -273,6 +273,3 @@ footer p { .tabs .tabs-link-selected:hover { background-color: #5E9F89; } -.container #services { - border: 3px dashed purple; -} \ No newline at end of file From 812c8482687b6f090a1557f062672783d1791442 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 12:42:29 -0500 Subject: [PATCH 46/71] Getting Better --- css/index.css | 5 +++-- js/index.js | 13 ++++++++++++- less/index.less | 5 +++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/css/index.css b/css/index.css index 432a2a449f..cc9bd02a9d 100644 --- a/css/index.css +++ b/css/index.css @@ -157,12 +157,13 @@ header { .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #ffffff; + color: #be2530; font-size: 20px; font-weight: bold; } .dropdown .dropdown-button:hover { - background-color: #be2530; + background-color: deeppink; + color: #FFFFFF; } .dropdown .dropdown-content { width: 100%; diff --git a/js/index.js b/js/index.js index 5230604579..19c100a28c 100644 --- a/js/index.js +++ b/js/index.js @@ -38,4 +38,15 @@ class TabLink { } const links = document.querySelectorAll(".tabs-link"); - links.forEach(link => new TabLink(link)) \ No newline at end of file + links.forEach(link => new TabLink(link)); + + + + class DropdownLink { + constructor(link2){ + console.log("this is right"); + } +} + + const dropdownLinks = document.querySelectorAll(".dropdown-link"); + dropdownLinks.forEach(link2 => new DropdownLink(link2)); \ No newline at end of file diff --git a/less/index.less b/less/index.less index 0777c0545e..0f0f110c4c 100644 --- a/less/index.less +++ b/less/index.less @@ -87,12 +87,13 @@ header { .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #ffffff; + color: #be2530; font-size: 20px; font-weight: bold; } .dropdown .dropdown-button:hover { - background-color: #be2530; + background-color: deeppink; + color: #FFFFFF; } .dropdown .dropdown-content { width: 100%; From 2dca3e3bed5c8f60ab7a7dd0a787c81e4da40b64 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 13:41:49 -0500 Subject: [PATCH 47/71] New Update --- contact.html | 6 +++--- js/index.js | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contact.html b/contact.html index 5b4725e309..579566a217 100644 --- a/contact.html +++ b/contact.html @@ -21,9 +21,9 @@

S&J

Dropdown
- Home - Services - Contact + Home + Services + Contact
diff --git a/js/index.js b/js/index.js index 19c100a28c..e98d319e7a 100644 --- a/js/index.js +++ b/js/index.js @@ -43,10 +43,11 @@ class TabLink { class DropdownLink { - constructor(link2){ - console.log("this is right"); + constructor(link2) { + this.link2 = link2; + } } const dropdownLinks = document.querySelectorAll(".dropdown-link"); - dropdownLinks.forEach(link2 => new DropdownLink(link2)); \ No newline at end of file + dropdownLinks.forEach(link2 => new DropdownLink(link2)); From 4ff3a0f5b0672f97fe4475f551274ad0e9ba07f3 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 14:02:35 -0500 Subject: [PATCH 48/71] Linked Dropdown --- index.html | 6 +++--- js/index.js | 19 +++++++++++++++++++ services.html | 6 +++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 91fe44fd4e..2f95cde75a 100644 --- a/index.html +++ b/index.html @@ -23,9 +23,9 @@

S&J

Dropdown
- Home - Services - Contact + Home + Services + Contact
diff --git a/js/index.js b/js/index.js index e98d319e7a..cba156ad73 100644 --- a/js/index.js +++ b/js/index.js @@ -40,6 +40,25 @@ class TabLink { const links = document.querySelectorAll(".tabs-link"); links.forEach(link => new TabLink(link)); + //Dropdown + + class Dropdown { + constructor(element) { + this.element = element; + this.button = this.element.querySelector(".dropdown-button"); + this.content = this.element.querySelector(".dropdown-content"); + this.button.addEventListener('click', () => { + this.toggleContent()}); + } + + toggleContent() { + this.content.classList.toggle("dropdown-hidden") + } + } + + + + let dropdowns = document.querySelectorAll('.dropdown').forEach( dropdown => new Dropdown(dropdown)); class DropdownLink { diff --git a/services.html b/services.html index 1e427802f3..eda66122eb 100644 --- a/services.html +++ b/services.html @@ -21,9 +21,9 @@

S&J

Dropdown
- Home - Services - Contact + Home + Services + Contact
From d846249e9d15143964a96a45d986608d95a80cf7 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 15:54:49 -0500 Subject: [PATCH 49/71] Almost There --- css/index.css | 48 ++++++++++++++++++++++++++++++++++++++-------- index.html | 13 +++++++------ js/index.js | 11 +---------- less/index.less | 51 ++++++++++++++++++++++++++++++++++++++----------- services.html | 7 +++---- 5 files changed, 91 insertions(+), 39 deletions(-) diff --git a/css/index.css b/css/index.css index cc9bd02a9d..d0325fe07a 100644 --- a/css/index.css +++ b/css/index.css @@ -142,16 +142,27 @@ table { margin: auto; font-family: Roboto; } -header { +.header-container { width: 100%; + height: 70px; + border-bottom: 1px solid #ffffff; display: flex; - padding: 15px; + justify-content: center; + align-items: center; + background-color: #828282; +} +.header-container .header { + height: 50px; +} +.header-container h2 { + color: #FFFFFF; } /*Dropdown Content*/ .dropdown { z-index: 2; position: absolute; - left: 25px; + top: 10px; + right: 425px; cursor: pointer; } .dropdown .dropdown-button { @@ -168,7 +179,7 @@ header { .dropdown .dropdown-content { width: 100%; position: absolute; - background-color: #ffffff; + background-color: #FFFFFF; display: flex; flex-direction: column; align-items: center; @@ -250,13 +261,34 @@ button { width: 200px; font-family: Arial; font-size: 28px; - border: 3px solid red; background: #D8D8D8; } +.main-content .right-bottom { + position: absolute; + padding: 20px; + right: 375px; + border: 2px dashed purple; +} +.main-content .left-bottom { + position: absolute; + padding: 20px; + left: 375px; + border: 2px dashed purple; +} .villas-text, .outskirts-text, .blocks-text { - width: 300px; + width: 100%; + text-align: center; +} +.villas-text p, +.outskirts-text p, +.blocks-text p { + font-family: Arial; + margin: 20px 180px; + padding: 30px; + line-height: 2; + border: 2px solid deeppink; } footer h3 { font-size: 20px; @@ -266,15 +298,15 @@ footer h3 { footer { background: #828282; display: flex; + justify-content: space-between; padding: 15px; - height: 200px; + height: 175px; } footer p { font-size: 14px; line-height: 26px; color: #FFFFFF; } -/* Contact Page*/ /*Services Page*/ .services-heading .center { position: absolute; diff --git a/index.html b/index.html index 2f95cde75a..386d045f1e 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@ -
+

S&J

Dropdown
@@ -28,7 +28,7 @@

S&J

Contact

-
+

@@ -87,7 +87,7 @@

Recent Projects

-

Interested in starting a project?
Let’s talk

+

Interested in starting a project?
Let’s talk


Email:
@@ -124,9 +124,10 @@

California

702 555 0144

- -

Copyright © 2018 Smith and Jones

-
+ +
+

Copyright © 2018 Smith and Jones

+
div>
diff --git a/js/index.js b/js/index.js index cba156ad73..f068a42638 100644 --- a/js/index.js +++ b/js/index.js @@ -57,16 +57,7 @@ class TabLink { } - let dropdowns = document.querySelectorAll('.dropdown').forEach( dropdown => new Dropdown(dropdown)); - class DropdownLink { - constructor(link2) { - this.link2 = link2; - - } -} - - const dropdownLinks = document.querySelectorAll(".dropdown-link"); - dropdownLinks.forEach(link2 => new DropdownLink(link2)); + \ No newline at end of file diff --git a/less/index.less b/less/index.less index 0f0f110c4c..5bb6219924 100644 --- a/less/index.less +++ b/less/index.less @@ -69,19 +69,30 @@ table{ margin: auto; font-family: Roboto; } -header { +.header-container { width: 100%; + height: 70px; + border-bottom: 1px solid #ffffff; display: flex; - padding: 15px; + justify-content: center; + align-items: center; + background-color: #828282; +} +.header-container .header { + height: 50px; } +.header-container h2 { + color:#FFFFFF +} /*Dropdown Content*/ .dropdown { z-index: 2; position: absolute; - left: 25px; + top: 10px; + right: 425px; cursor: pointer; } .dropdown .dropdown-button { @@ -98,7 +109,7 @@ header { .dropdown .dropdown-content { width: 100%; position: absolute; - background-color: #ffffff; + background-color: #FFFFFF; display: flex; flex-direction: column; align-items: center; @@ -191,12 +202,33 @@ button { width: 200px; font-family: Arial; font-size: 28px; - border: 3px solid red; background: #D8D8D8; } +.main-content .right-bottom{ + position: absolute; + padding: 20px; + right: 375px; + border: 2px dashed purple; + } + +.main-content .left-bottom { + position: absolute; + padding: 20px; + left: 375px; + border: 2px dashed purple; +} .villas-text, .outskirts-text, .blocks-text { - width: 300px; + width: 100%; + text-align: center; + + p { + font-family: Arial; + margin: 20px 180px; + padding: 30px; + line-height: 2; + border: 2px solid deeppink; + } } footer h3 { @@ -208,8 +240,9 @@ footer h3 { footer { background: #828282; display: flex; + justify-content: space-between; padding: 15px; - height: 200px; + height: 175px; } footer p { @@ -218,10 +251,6 @@ footer p { color: #FFFFFF; } - -/* Contact Page*/ - - /*Services Page*/ .services-heading .center { diff --git a/services.html b/services.html index eda66122eb..1da5e8d2e9 100644 --- a/services.html +++ b/services.html @@ -16,7 +16,7 @@ -
+

S&J

Dropdown
@@ -25,9 +25,8 @@

S&J

Services Contact

-

- -
+
+
servicesImage From 84c8f34a70444af96687a627c9086fb7bb922efa Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 16:04:34 -0500 Subject: [PATCH 50/71] ... --- css/index.css | 8 ++------ index.html | 5 +++-- less/index.less | 14 +++++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/css/index.css b/css/index.css index d0325fe07a..a9bf47ec05 100644 --- a/css/index.css +++ b/css/index.css @@ -173,13 +173,13 @@ table { font-weight: bold; } .dropdown .dropdown-button:hover { - background-color: deeppink; + background-color: #828282; color: #FFFFFF; } .dropdown .dropdown-content { width: 100%; position: absolute; - background-color: #FFFFFF; + background-color: #828282; display: flex; flex-direction: column; align-items: center; @@ -249,7 +249,6 @@ button { } .main-content { justify-content: center; - border: 2px dashed cyan; } .subHeaders h2, .main-content h2 { @@ -267,13 +266,11 @@ button { position: absolute; padding: 20px; right: 375px; - border: 2px dashed purple; } .main-content .left-bottom { position: absolute; padding: 20px; left: 375px; - border: 2px dashed purple; } .villas-text, .outskirts-text, @@ -288,7 +285,6 @@ button { margin: 20px 180px; padding: 30px; line-height: 2; - border: 2px solid deeppink; } footer h3 { font-size: 20px; diff --git a/index.html b/index.html index 386d045f1e..630c456888 100644 --- a/index.html +++ b/index.html @@ -63,11 +63,12 @@

Futuristic Designs


Recent Projects

-
Villas
+
Villas
-
+

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

+
Outskirts
diff --git a/less/index.less b/less/index.less index 5bb6219924..439420a33b 100644 --- a/less/index.less +++ b/less/index.less @@ -103,13 +103,13 @@ table{ font-weight: bold; } .dropdown .dropdown-button:hover { - background-color: deeppink; - color: #FFFFFF; + background-color: #828282; + color:#FFFFFF; } .dropdown .dropdown-content { width: 100%; position: absolute; - background-color: #FFFFFF; + background-color: #828282; display: flex; flex-direction: column; align-items: center; @@ -189,7 +189,7 @@ button { .main-content { justify-content: center; - border: 2px dashed cyan; + //border: 2px dashed cyan; } @@ -209,14 +209,14 @@ button { position: absolute; padding: 20px; right: 375px; - border: 2px dashed purple; + //border: 2px dashed purple; } .main-content .left-bottom { position: absolute; padding: 20px; left: 375px; - border: 2px dashed purple; + //border: 2px dashed purple; } .villas-text, .outskirts-text, .blocks-text { width: 100%; @@ -227,7 +227,7 @@ button { margin: 20px 180px; padding: 30px; line-height: 2; - border: 2px solid deeppink; + //border: 2px solid deeppink; } } From 06c7163133649c785694678c3b93be4091135064 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 16:52:53 -0500 Subject: [PATCH 51/71] Working On Hamburger Effect --- css/index.css | 24 ++++++++++++++++++++++++ index.html | 12 ++++++++++-- js/index.js | 6 +++++- less/index.less | 27 +++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 3 deletions(-) diff --git a/css/index.css b/css/index.css index a9bf47ec05..1882530e0a 100644 --- a/css/index.css +++ b/css/index.css @@ -137,6 +137,30 @@ table { * { box-sizing: border-box; } +.header-container { + display: inline-block; + cursor: pointer; +} +.bar1, +.bar2, +.bar3 { + width: 15px; + height: 5px; + background-color: #333; + margin: 6px 0; + transition: 0.4s ease; +} +.change .bar1 { + -webkit-transform: rotate(-45deg) translate(-9px, 0px); + transform: rotate(-45deg) translate(-9px, 0px); +} +.change .bar2 { + opacity: 0; +} +.change .bar3 { + -webkit-transform: rotate(45deg) translate(-8px, -8px); + transform: rotate(45deg) translate(-8px, -8px); +} .container { width: 880px; margin: auto; diff --git a/index.html b/index.html index 630c456888..0d3e2ecec9 100644 --- a/index.html +++ b/index.html @@ -16,9 +16,17 @@
+ + +
+
+
+
+
+ -
+
diff --git a/js/index.js b/js/index.js index f068a42638..3c23a85e3e 100644 --- a/js/index.js +++ b/js/index.js @@ -59,5 +59,9 @@ class TabLink { let dropdowns = document.querySelectorAll('.dropdown').forEach( dropdown => new Dropdown(dropdown)); - + + //Hamburger Menu + function myFunction(x) { + x.classList.toggle("change"); + } \ No newline at end of file diff --git a/less/index.less b/less/index.less index 439420a33b..7651e16f6c 100644 --- a/less/index.less +++ b/less/index.less @@ -63,6 +63,33 @@ table{ * { box-sizing: border-box; } +//Hamburger Menu +.header-container { + display: inline-block; + cursor: pointer; +} + +.bar1, .bar2, .bar3 { + width: 15px; + height: 5px; + background-color: #333; + margin: 6px 0; + transition: 0.4s ease; +} + +.change .bar1 { + -webkit-transform: rotate(-45deg) translate(-9px, 0px) ; + transform: rotate(-45deg) translate(-9px, 0px) ; +} +.change .bar2 { + opacity: 0; +} + +.change .bar3 { + -webkit-transform: rotate(45deg) translate(-8px, -8px) ; + transform: rotate(45deg) translate(-8px, -8px) ; +} + .container { width: 880px; From 91737f6a72ab71d86e7d59166e4afe66efe47a5e Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 18:11:24 -0500 Subject: [PATCH 52/71] Working Out The Hamburger Thingy --- css/index.css | 24 ------------------------ index.html | 11 +++-------- js/index.js | 3 --- less/index.less | 25 ------------------------- 4 files changed, 3 insertions(+), 60 deletions(-) diff --git a/css/index.css b/css/index.css index 1882530e0a..a9bf47ec05 100644 --- a/css/index.css +++ b/css/index.css @@ -137,30 +137,6 @@ table { * { box-sizing: border-box; } -.header-container { - display: inline-block; - cursor: pointer; -} -.bar1, -.bar2, -.bar3 { - width: 15px; - height: 5px; - background-color: #333; - margin: 6px 0; - transition: 0.4s ease; -} -.change .bar1 { - -webkit-transform: rotate(-45deg) translate(-9px, 0px); - transform: rotate(-45deg) translate(-9px, 0px); -} -.change .bar2 { - opacity: 0; -} -.change .bar3 { - -webkit-transform: rotate(45deg) translate(-8px, -8px); - transform: rotate(45deg) translate(-8px, -8px); -} .container { width: 880px; margin: auto; diff --git a/index.html b/index.html index 0d3e2ecec9..94f7ea4d71 100644 --- a/index.html +++ b/index.html @@ -16,17 +16,12 @@
- -
-
-
-
-
+ - +
diff --git a/js/index.js b/js/index.js index 3c23a85e3e..0adcbf3758 100644 --- a/js/index.js +++ b/js/index.js @@ -61,7 +61,4 @@ class TabLink { //Hamburger Menu - function myFunction(x) { - x.classList.toggle("change"); - } \ No newline at end of file diff --git a/less/index.less b/less/index.less index 7651e16f6c..060d143f19 100644 --- a/less/index.less +++ b/less/index.less @@ -64,31 +64,6 @@ table{ box-sizing: border-box; } //Hamburger Menu -.header-container { - display: inline-block; - cursor: pointer; -} - -.bar1, .bar2, .bar3 { - width: 15px; - height: 5px; - background-color: #333; - margin: 6px 0; - transition: 0.4s ease; -} - -.change .bar1 { - -webkit-transform: rotate(-45deg) translate(-9px, 0px) ; - transform: rotate(-45deg) translate(-9px, 0px) ; -} -.change .bar2 { - opacity: 0; -} - -.change .bar3 { - -webkit-transform: rotate(45deg) translate(-8px, -8px) ; - transform: rotate(45deg) translate(-8px, -8px) ; -} .container { From f9e9a95ac8ed8af8df7c3f6c95d1dfc38594515d Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Thu, 20 Dec 2018 18:30:46 -0500 Subject: [PATCH 53/71] .. --- index.html | 2 +- services.html | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 94f7ea4d71..83a8fe26f7 100644 --- a/index.html +++ b/index.html @@ -131,7 +131,7 @@

California

Copyright © 2018 Smith and Jones

-
div> +
diff --git a/services.html b/services.html index 1da5e8d2e9..d5fa8900b2 100644 --- a/services.html +++ b/services.html @@ -139,9 +139,10 @@

California

702 555 0144

- -

Copyright © 2018 Smith and Jones

+
+

Copyright © 2018 Smith and Jones

+
From 35db1f00f20d838bd1557ec0cb762edad2bda6f9 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 00:01:56 -0500 Subject: [PATCH 54/71] Time for Bed --- css/index.css | 2 +- index.html | 4 +++- js/index.js | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index a9bf47ec05..2c8100e27c 100644 --- a/css/index.css +++ b/css/index.css @@ -138,7 +138,7 @@ table { box-sizing: border-box; } .container { - width: 880px; + max-width: 880px; margin: auto; font-family: Roboto; } diff --git a/index.html b/index.html index 83a8fe26f7..f9b9d1da36 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,9 @@
- + diff --git a/js/index.js b/js/index.js index 0adcbf3758..ff8483709e 100644 --- a/js/index.js +++ b/js/index.js @@ -1,5 +1,8 @@ // JS goes here +document.getElementById("viewport").setAttribute("content", + "initial-scale=0.5; maximum-scale=1.0; user-scalable=0;"); + //Service page class TabLink { From 9c18bebe35b26966ddbf7bc2d2f99adab1d718c0 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 01:26:45 -0500 Subject: [PATCH 55/71] Can't Sleep --- index.html | 4 ---- js/index.js | 2 -- less/index.less | 3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index f9b9d1da36..81df54e92c 100644 --- a/index.html +++ b/index.html @@ -16,10 +16,6 @@
- - diff --git a/js/index.js b/js/index.js index ff8483709e..282fa059bb 100644 --- a/js/index.js +++ b/js/index.js @@ -1,7 +1,5 @@ // JS goes here -document.getElementById("viewport").setAttribute("content", - "initial-scale=0.5; maximum-scale=1.0; user-scalable=0;"); //Service page diff --git a/less/index.less b/less/index.less index 060d143f19..ff5561e521 100644 --- a/less/index.less +++ b/less/index.less @@ -67,8 +67,9 @@ table{ .container { - width: 880px; + max-width: 1000px; margin: auto; + font-size: 1.6rem; font-family: Roboto; } .header-container { From eb5e7988afefcb212266fd2f12ede7c9c1138ebd Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 01:53:32 -0500 Subject: [PATCH 56/71] ... --- css/index.css | 8 +++++--- index.html | 2 +- less/index.less | 9 ++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/css/index.css b/css/index.css index 2c8100e27c..f5214c2f9d 100644 --- a/css/index.css +++ b/css/index.css @@ -138,7 +138,7 @@ table { box-sizing: border-box; } .container { - max-width: 880px; + max-width: 1000px; margin: auto; font-family: Roboto; } @@ -249,6 +249,7 @@ button { } .main-content { justify-content: center; + border: 2px dashed cyan; } .subHeaders h2, .main-content h2 { @@ -282,9 +283,10 @@ button { .outskirts-text p, .blocks-text p { font-family: Arial; - margin: 20px 180px; + margin: 10px 180px; padding: 30px; - line-height: 2; + line-height: 1.25; + border: 2px solid deeppink; } footer h3 { font-size: 20px; diff --git a/index.html b/index.html index 81df54e92c..12c390ff32 100644 --- a/index.html +++ b/index.html @@ -42,7 +42,7 @@

S&J

-

Smith & Jones Architects


+

Smith & Jones Architects


Et sed autem causae appareat, tempor abhorreant te mei, facer facilisis sit ea. Eu timeam vidisse consectetuer sed. Duo etiam laboramus dissentiet in, nec no errem

diff --git a/less/index.less b/less/index.less index ff5561e521..e06dfc8366 100644 --- a/less/index.less +++ b/less/index.less @@ -69,7 +69,6 @@ table{ .container { max-width: 1000px; margin: auto; - font-size: 1.6rem; font-family: Roboto; } .header-container { @@ -192,7 +191,7 @@ button { .main-content { justify-content: center; - //border: 2px dashed cyan; + border: 2px dashed cyan; } @@ -227,10 +226,10 @@ button { p { font-family: Arial; - margin: 20px 180px; + margin: 10px 180px; padding: 30px; - line-height: 2; - //border: 2px solid deeppink; + line-height: 1.25; + border: 2px solid deeppink; } } From a263cc4dfbf9de0c16a3457f0f740f6fa064e943 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 08:30:16 -0500 Subject: [PATCH 57/71] Getting Started Again --- css/index.css | 11 +++++------ less/index.less | 14 ++++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/css/index.css b/css/index.css index f5214c2f9d..088e226b6b 100644 --- a/css/index.css +++ b/css/index.css @@ -138,7 +138,7 @@ table { box-sizing: border-box; } .container { - max-width: 1000px; + max-width: 880px; margin: auto; font-family: Roboto; } @@ -249,7 +249,6 @@ button { } .main-content { justify-content: center; - border: 2px dashed cyan; } .subHeaders h2, .main-content h2 { @@ -266,12 +265,12 @@ button { .main-content .right-bottom { position: absolute; padding: 20px; - right: 375px; + right: 325px; } .main-content .left-bottom { position: absolute; padding: 20px; - left: 375px; + left: 325px; } .villas-text, .outskirts-text, @@ -284,9 +283,9 @@ button { .blocks-text p { font-family: Arial; margin: 10px 180px; - padding: 30px; + padding: 20px; + width: 400px; line-height: 1.25; - border: 2px solid deeppink; } footer h3 { font-size: 20px; diff --git a/less/index.less b/less/index.less index e06dfc8366..8c0167c009 100644 --- a/less/index.less +++ b/less/index.less @@ -67,10 +67,11 @@ table{ .container { - max-width: 1000px; + max-width: 880px; margin: auto; font-family: Roboto; } + .header-container { width: 100%; height: 70px; @@ -191,7 +192,7 @@ button { .main-content { justify-content: center; - border: 2px dashed cyan; + //border: 2px dashed cyan; } @@ -210,14 +211,14 @@ button { .main-content .right-bottom{ position: absolute; padding: 20px; - right: 375px; + right: 325px; //border: 2px dashed purple; } .main-content .left-bottom { position: absolute; padding: 20px; - left: 375px; + left: 325px; //border: 2px dashed purple; } .villas-text, .outskirts-text, .blocks-text { @@ -227,9 +228,10 @@ button { p { font-family: Arial; margin: 10px 180px; - padding: 30px; + padding: 20px; + width: 400px; line-height: 1.25; - border: 2px solid deeppink; + //border: 2px solid deeppink; } } From 630112ba924e2fd40b524fb832f32adf6b4fd215 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 09:49:49 -0500 Subject: [PATCH 58/71] Editing Header Container --- css/index.css | 29 +++++++++++++++++++++++------ less/index.less | 36 +++++++++++++++++++++++++++--------- services.html | 10 ++++------ 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/css/index.css b/css/index.css index 088e226b6b..46a3fd46ff 100644 --- a/css/index.css +++ b/css/index.css @@ -139,7 +139,7 @@ table { } .container { max-width: 880px; - margin: auto; + margin: 0 auto; font-family: Roboto; } .header-container { @@ -147,16 +147,22 @@ table { height: 70px; border-bottom: 1px solid #ffffff; display: flex; - justify-content: center; + justify-content: flex-start; align-items: center; background-color: #828282; } .header-container .header { - height: 50px; + height: 30px; } .header-container h2 { + margin: 0 25px; + font-weight: bold; color: #FFFFFF; } +img { + width: 100%; + height: auto; +} /*Dropdown Content*/ .dropdown { z-index: 2; @@ -169,7 +175,7 @@ table { padding: 15px; border: 3px solid #ffffff; color: #be2530; - font-size: 20px; + font-size: 2rem; font-weight: bold; } .dropdown .dropdown-button:hover { @@ -190,7 +196,7 @@ table { width: 100%; text-align: center; padding: 15px 0; - font-size: 18px; + font-size: 1.8rem; text-decoration: none; color: #931d25; } @@ -286,6 +292,7 @@ button { padding: 20px; width: 400px; line-height: 1.25; + border: 2px solid deeppink; } footer h3 { font-size: 20px; @@ -305,9 +312,19 @@ footer p { color: #FFFFFF; } /*Services Page*/ -.services-heading .center { +.services-heading { + position: relative; + text-align: center; + margin: 0 0 20px 0; +} +.services-heading .bottom-left { position: absolute; + top: 120px; + left: 60px; font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; } .tabs { width: 100%; diff --git a/less/index.less b/less/index.less index 8c0167c009..dd6c8be122 100644 --- a/less/index.less +++ b/less/index.less @@ -68,7 +68,7 @@ table{ .container { max-width: 880px; - margin: auto; + margin: 0 auto; font-family: Roboto; } @@ -77,18 +77,25 @@ table{ height: 70px; border-bottom: 1px solid #ffffff; display: flex; - justify-content: center; + justify-content: flex-start; align-items: center; background-color: #828282; } .header-container .header { - height: 50px; + height: 30px; } .header-container h2 { + margin: 0 25px; + font-weight: bold; color:#FFFFFF } +img { + width: 100%; + height: auto; +} + /*Dropdown Content*/ .dropdown { @@ -102,7 +109,7 @@ table{ padding: 15px; border: 3px solid #ffffff; color: #be2530; - font-size: 20px; + font-size: 2rem; font-weight: bold; } .dropdown .dropdown-button:hover { @@ -123,7 +130,7 @@ table{ width: 100%; text-align: center; padding: 15px 0; - font-size: 18px; + font-size: 1.8rem; text-decoration: none; color: #931d25; } @@ -231,7 +238,7 @@ button { padding: 20px; width: 400px; line-height: 1.25; - //border: 2px solid deeppink; + border: 2px solid deeppink; } } @@ -257,11 +264,22 @@ footer p { /*Services Page*/ -.services-heading .center { - position: absolute; - font-weight: bold; +.services-heading { + position: relative; + text-align: center; + margin: 0 0 20px 0; } +.services-heading .bottom-left { + position: absolute; + top: 120px; + left: 60px; + font-weight: bold; + font-size: 64px; + line-height: 75px; + color: #FFFFFF; + } + .tabs { width: 100%; } diff --git a/services.html b/services.html index d5fa8900b2..1a3d3d2962 100644 --- a/services.html +++ b/services.html @@ -30,14 +30,12 @@

S&J

servicesImage -
Services
+
Services
- - - +
+

Services include: completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

+
+ +
jumboImage
Integrity,
diff --git a/less/index.less b/less/index.less index 198100eb2e..55d8d1aae6 100644 --- a/less/index.less +++ b/less/index.less @@ -69,6 +69,7 @@ table{ max-width: 880px; margin: 0 auto; font-family: Roboto; + border: 1px solid black; } .header-container { @@ -96,32 +97,7 @@ table{ } //Hamburger Container -.hamburger-container { - display: inline-block; - cursor: pointer; -} - -.bar1, .bar2, .bar3 { - width: 35px; - height: 5px; - background-color: #FFFFFF; - margin: 6px auto; - transition: 0.4s; -} - -.change .bar1 { - -webkit-transform: rotate(-45deg) translate(-9px, 6px) ; - transform: rotate(-45deg) translate(-9px, 6px) ; -} -.change .bar2 { - opacity: 0; -} - -.change .bar3 { - -webkit-transform: rotate(45deg) translate(-8px, -8px) ; - transform: rotate(45deg) translate(-8px, -8px) ; -} //Hamburger End img { @@ -315,6 +291,13 @@ footer p { color: #FFFFFF; } + .container .description p { + display: flex; + margin: 15px 30px; + + + } + .tabs img { width: 50%; height: auto; @@ -330,6 +313,7 @@ footer p { .tabs .tabs-item { display: none; width: 75%; + } .tabs .tabs-item .tabs-item-title { font-size: 24px; @@ -341,14 +325,16 @@ footer p { } .tabs .tabs-links { display: flex; - + justify-content: space-between; } .tabs .tabs-link { padding: 20px 25px; - font-size: 24px; + display: flex; + font-size: 20px; + font-weight: bold; border: 1px solid #5E9F89; - border-right: 1px solid #5E9F89; cursor: pointer; + } .tabs .tabs-link:hover { background-color:#5E9F89; From d0295a624e7d25603c82db7a9485485dc0366665 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 13:33:25 -0500 Subject: [PATCH 63/71] Still Grinding --- css/index.css | 8 +++++++- less/index.less | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/css/index.css b/css/index.css index 043147e6b7..9d7a0ca0e7 100644 --- a/css/index.css +++ b/css/index.css @@ -336,6 +336,12 @@ footer p { display: flex; margin: 15px 30px; } +.section { + padding: 20px; + border: 1px solid deeppink; + height: 555px; + bottom: 30px; +} .tabs img { width: 50%; height: auto; @@ -345,11 +351,11 @@ footer p { height: 300px; display: flex; justify-content: center; - padding-top: 20px; } .tabs .tabs-item { display: none; width: 75%; + padding: 20px; } .tabs .tabs-item .tabs-item-title { font-size: 24px; diff --git a/less/index.less b/less/index.less index 55d8d1aae6..87373af537 100644 --- a/less/index.less +++ b/less/index.less @@ -297,6 +297,12 @@ footer p { } + .section { + padding: 20px; + border: 1px solid deeppink; + height: 555px; + bottom: 30px; + } .tabs img { width: 50%; @@ -308,11 +314,11 @@ footer p { height: 300px; display: flex; justify-content: center; - padding-top: 20px; } .tabs .tabs-item { display: none; width: 75%; + padding: 20px; } .tabs .tabs-item .tabs-item-title { From 6bf0c0c53104659088e349323c2c58562352ba51 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 15:15:24 -0500 Subject: [PATCH 64/71] .. --- css/index.css | 6 ------ less/index.less | 9 +-------- services.html | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/css/index.css b/css/index.css index 9d7a0ca0e7..0a8ed057e0 100644 --- a/css/index.css +++ b/css/index.css @@ -336,12 +336,6 @@ footer p { display: flex; margin: 15px 30px; } -.section { - padding: 20px; - border: 1px solid deeppink; - height: 555px; - bottom: 30px; -} .tabs img { width: 50%; height: auto; diff --git a/less/index.less b/less/index.less index 87373af537..2aae99b3d4 100644 --- a/less/index.less +++ b/less/index.less @@ -294,16 +294,9 @@ footer p { .container .description p { display: flex; margin: 15px 30px; - - - } - .section { - padding: 20px; - border: 1px solid deeppink; - height: 555px; - bottom: 30px; } + .tabs img { width: 50%; height: auto; diff --git a/services.html b/services.html index 1a3d3d2962..b5de8255b9 100644 --- a/services.html +++ b/services.html @@ -46,7 +46,7 @@

S&J

Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.

Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities. --> -
+
Pre-Construction
From 6c004fe5217d71ab5a697ad4a296dea6ca889fea Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 15:30:01 -0500 Subject: [PATCH 65/71] Much Improved --- css/index.css | 3 ++- index.html | 6 +++--- less/index.less | 3 ++- services.html | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/css/index.css b/css/index.css index 0a8ed057e0..1ad34a781f 100644 --- a/css/index.css +++ b/css/index.css @@ -342,9 +342,10 @@ footer p { } .tabs .tabs-items { width: 100%; - height: 300px; + height: 450px; display: flex; justify-content: center; + border: 1px solid deeppink; } .tabs .tabs-item { display: none; diff --git a/index.html b/index.html index 946ee3eaa9..47bda3d8e1 100644 --- a/index.html +++ b/index.html @@ -69,7 +69,7 @@

Recent Projects

Villas
- +

The Villas bring to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

@@ -78,7 +78,7 @@

Recent Projects

Outskirts
- +

The Outskirts are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

@@ -86,7 +86,7 @@

Recent Projects

Blocks
- +

The Blocks are amazing to the table win-win survival strategies to ensure proactive domination. At the end of the day, going forward, a new normal that has evolved from generation X is on the runway heading towards a streamlined cloud solution.

Capitalize on low hanging fruit to identify a ballpark value added activity to beta test. Override the digital divide with additional clickthroughs from DevOps. Nanotechnology immersion along the information highway will close the loop on focusing solely on the bottom line.

diff --git a/less/index.less b/less/index.less index 2aae99b3d4..ba968670c8 100644 --- a/less/index.less +++ b/less/index.less @@ -304,9 +304,10 @@ footer p { } .tabs .tabs-items { width: 100%; - height: 300px; + height: 450px; display: flex; justify-content: center; + border: 1px solid deeppink; } .tabs .tabs-item { display: none; diff --git a/services.html b/services.html index b5de8255b9..12e5c5b6d0 100644 --- a/services.html +++ b/services.html @@ -65,7 +65,7 @@

S&J

-
+
Construction
@@ -90,6 +90,7 @@

S&J

Completely synergize resource taxing relationships via premier niche markets. Professionally cultivate one-to-one customer service with robust ideas. Dynamically innovate resource-leveling customer service for state of the art customer service.Phosfluorescently engage worldwide methodologies with web-enabled technology. Interactively coordinate proactive e-commerce via process-centric "outside the box" thinking. Completely pursue scalable customer service through sustainable potentialities.

+
From 97d04bb134e7a6815a3394b10327be955be46d6c Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 15:38:24 -0500 Subject: [PATCH 66/71] Much Better --- css/index.css | 6 ++---- less/index.less | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/css/index.css b/css/index.css index 1ad34a781f..fb9d1c39d6 100644 --- a/css/index.css +++ b/css/index.css @@ -273,7 +273,6 @@ button { font-family: Arial; font-size: 28px; background: #D8D8D8; - border: 3px solid deeppink; } .main-content .right-bottom { position: absolute; @@ -341,16 +340,15 @@ footer p { height: auto; } .tabs .tabs-items { + display: flex; width: 100%; height: 450px; - display: flex; justify-content: center; - border: 1px solid deeppink; } .tabs .tabs-item { display: none; width: 75%; - padding: 20px; + padding: 30px; } .tabs .tabs-item .tabs-item-title { font-size: 24px; diff --git a/less/index.less b/less/index.less index ba968670c8..aa1205f3ec 100644 --- a/less/index.less +++ b/less/index.less @@ -223,7 +223,6 @@ button { font-family: Arial; font-size: 28px; background: #D8D8D8; - border: 3px solid deeppink; } .main-content .right-bottom{ @@ -303,17 +302,16 @@ footer p { } .tabs .tabs-items { + display: flex; width: 100%; height: 450px; - display: flex; justify-content: center; - border: 1px solid deeppink; } .tabs .tabs-item { display: none; width: 75%; - padding: 20px; - + padding: 30px; + } .tabs .tabs-item .tabs-item-title { font-size: 24px; From d9ca65f4d99afabed72a9afa8d9da5c708dee8ad Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 16:29:06 -0500 Subject: [PATCH 67/71] Working on Mobile --- css/index.css | 51 +++++++++++++++++++++++++++++++++------- index.html | 2 +- less/index.less | 62 +++++++++++++++++++++++++++++++++++++++---------- services.html | 3 ++- 4 files changed, 95 insertions(+), 23 deletions(-) diff --git a/css/index.css b/css/index.css index fb9d1c39d6..fb271ef4e0 100644 --- a/css/index.css +++ b/css/index.css @@ -140,6 +140,7 @@ table { .container { max-width: 880px; margin: 0 auto; + padding: 20px 1.25%; font-family: Roboto; border: 1px solid black; } @@ -160,9 +161,24 @@ table { font-weight: bold; color: #FFFFFF; } -@media (max-width: 600px) { - flex-direction: column; - align-items: center; +@media (max-width: 400px) { + .container { + width: 400px; + } + .header-container { + flex-wrap: wrap; + justify-content: center; + } + .header-container h2 { + justify-content: center; + flex-direction: column; + } + .header-container .dropdown-button { + display: flex; + flex-direction: column; + margin: 0; + align-items: center; + } } img { width: 100%; @@ -179,13 +195,13 @@ img { .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #be2530; + color: #FFFFFF; font-size: 2rem; font-weight: bold; } .dropdown .dropdown-button:hover { - background-color: #828282; - color: #FFFFFF; + background-color: #FFFFFF; + color: #828282; } .dropdown .dropdown-content { width: 100%; @@ -195,7 +211,7 @@ img { flex-direction: column; align-items: center; margin-top: 10px; - border: 2.5px solid #931d25; + border: 2.5px solid #828282; } .dropdown .dropdown-link { width: 100%; @@ -203,11 +219,11 @@ img { padding: 15px 0; font-size: 1.8rem; text-decoration: none; - color: #931d25; + color: #FFFFFF; } .dropdown .dropdown-link:hover { color: #ffffff; - background-color: #931d25; + background-color: #828282; } .dropdown .dropdown-hidden { display: none; @@ -316,6 +332,23 @@ footer p { line-height: 26px; color: #FFFFFF; } +@media (max-width: 500px) { + .container { + width: 500px; + } + .header-container { + flex-wrap: wrap; + justify-content: center; + } + .header .dropdown { + width: 100%; + display: flex; + flex-direction: column; + margin: 0; + align-items: center; + padding: 0; + } +} /*Services Page*/ .services-heading { position: relative; diff --git a/index.html b/index.html index 47bda3d8e1..7be41b7146 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,7 @@

S&J

-
Dropdown
+
Menu
Home Services diff --git a/less/index.less b/less/index.less index aa1205f3ec..f98c386614 100644 --- a/less/index.less +++ b/less/index.less @@ -68,6 +68,7 @@ table{ .container { max-width: 880px; margin: 0 auto; + padding: 20px 1.25%; font-family: Roboto; border: 1px solid black; } @@ -91,14 +92,29 @@ table{ color:#FFFFFF } -@media(max-width: 600px) { - flex-direction: column; - align-items: center; -} +@media(max-width: 400px) { + .container { + width: 400px; + } -//Hamburger Container + .header-container { + flex-wrap: wrap; + justify-content: center; + } + .header-container h2 { + justify-content: center; + flex-direction: column; + } -//Hamburger End + .header-container .dropdown-button { + display: flex; + flex-direction: column; + margin: 0; + align-items: center; + } + + +} img { width: 100%; @@ -117,13 +133,13 @@ img { .dropdown .dropdown-button { padding: 15px; border: 3px solid #ffffff; - color: #be2530; + color: #FFFFFF; font-size: 2rem; font-weight: bold; } .dropdown .dropdown-button:hover { - background-color: #828282; - color:#FFFFFF; + background-color: #FFFFFF; + color:#828282; } .dropdown .dropdown-content { width: 100%; @@ -133,7 +149,7 @@ img { flex-direction: column; align-items: center; margin-top: 10px; - border: 2.5px solid #931d25; + border: 2.5px solid #828282;; } .dropdown .dropdown-link { width: 100%; @@ -141,11 +157,11 @@ img { padding: 15px 0; font-size: 1.8rem; text-decoration: none; - color: #931d25; + color: #FFFFFF; } .dropdown .dropdown-link:hover { color: #ffffff; - background-color: #931d25; + background-color: #828282;; } .dropdown .dropdown-hidden { display: none; @@ -272,6 +288,28 @@ footer p { color: #FFFFFF; } +@media(max-width: 500px) { +.container { + width:500px; +} + +.header-container { + flex-wrap: wrap; + justify-content:center; +} + +.header .dropdown { + width: 100%; + display: flex; + flex-direction: column; + margin: 0; + align-items: center; + padding: 0; +} + + +} + /*Services Page*/ .services-heading { diff --git a/services.html b/services.html index 12e5c5b6d0..802ed6b6ec 100644 --- a/services.html +++ b/services.html @@ -17,9 +17,10 @@
+

S&J

-
Dropdown
+
Menu
Home Services From 40389d581c4206c2e6298b934ef661cf7078120b Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 17:00:48 -0500 Subject: [PATCH 68/71] ... --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 7be41b7146..71e772820c 100644 --- a/index.html +++ b/index.html @@ -31,9 +31,9 @@

S&J

- + - +
jumboImage
Integrity,
From 2b9904dc847224ead0df443ff87d3f3e733bd024 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 17:38:30 -0500 Subject: [PATCH 69/71] Mobile is Kicking my ........ --- contact.html | 7 +++---- index.html | 4 ++-- less/index.less | 2 ++ services.html | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/contact.html b/contact.html index 579566a217..8e241897d4 100644 --- a/contact.html +++ b/contact.html @@ -20,10 +20,9 @@

S&J

Dropdown
-
- Home - Services - Contact + Home + Services + Contact
diff --git a/index.html b/index.html index 71e772820c..6a7dac7c7e 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,7 @@

S&J

Home Services - Contact + Contact

@@ -35,7 +35,7 @@

S&J

- jumboImage + jumboImage
Integrity,
Excellence,
Progress.
diff --git a/less/index.less b/less/index.less index f98c386614..3e60316833 100644 --- a/less/index.less +++ b/less/index.less @@ -293,6 +293,7 @@ footer p { width:500px; } + .header-container { flex-wrap: wrap; justify-content:center; @@ -385,3 +386,4 @@ footer p { background-color: #5E9F89; } +//Contact \ No newline at end of file diff --git a/services.html b/services.html index 802ed6b6ec..700c71062d 100644 --- a/services.html +++ b/services.html @@ -22,9 +22,9 @@

S&J

Menu
- Home - Services - Contact + Home + Services + Contact

From 7f836d6172f31b691ce13d434f3489f9c5acd0fb Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 18:12:13 -0500 Subject: [PATCH 70/71] Mobile Not Good --- css/index.css | 50 +++++++++++++++++++++++++++++++------------------ index.html | 8 ++++++-- less/index.less | 31 +++++++++++++++++++----------- 3 files changed, 58 insertions(+), 31 deletions(-) diff --git a/css/index.css b/css/index.css index fb271ef4e0..cb462cb393 100644 --- a/css/index.css +++ b/css/index.css @@ -134,6 +134,8 @@ table { border-spacing: 0; } /* Your Code Goes Here */ +@villas Mobile: + * { box-sizing: border-box; } @@ -161,24 +163,19 @@ table { font-weight: bold; color: #FFFFFF; } -@media (max-width: 400px) { - .container { - width: 400px; - } - .header-container { - flex-wrap: wrap; - justify-content: center; - } - .header-container h2 { - justify-content: center; - flex-direction: column; - } - .header-container .dropdown-button { - display: flex; - flex-direction: column; - margin: 0; - align-items: center; - } +.header-container { + flex-wrap: wrap; + justify-content: center; +} +.header-container h2 { + justify-content: center; + flex-direction: column; +} +.header-container .dropdown-button { + display: flex; + flex-direction: column; + margin: 0; + align-items: center; } img { width: 100%; @@ -348,6 +345,23 @@ footer p { align-items: center; padding: 0; } + .jumbotron { + width: 75%; + } + .subHeaders { + display: flex; + flex-direction: column; + } + .right.bottom, + .left-bottom { + display: flex; + flex-direction: column; + justify-content: center; + } + .title { + display: flex; + justify-conten: center; + } } /*Services Page*/ .services-heading { diff --git a/index.html b/index.html index 6a7dac7c7e..f64a9fbbf6 100644 --- a/index.html +++ b/index.html @@ -36,10 +36,12 @@

S&J

jumboImage +
Integrity,
Excellence,
Progress.
+
@@ -49,8 +51,10 @@

Smith & Jones Architects


- -
+ + + +

diff --git a/less/index.less b/less/index.less index 3e60316833..f7d7709591 100644 --- a/less/index.less +++ b/less/index.less @@ -58,7 +58,7 @@ table{ } /* Your Code Goes Here */ - +@villasMobile: * { box-sizing: border-box; @@ -92,11 +92,6 @@ table{ color:#FFFFFF } -@media(max-width: 400px) { - .container { - width: 400px; - } - .header-container { flex-wrap: wrap; justify-content: center; @@ -114,8 +109,6 @@ table{ } -} - img { width: 100%; height: auto; @@ -287,30 +280,46 @@ footer p { line-height: 26px; color: #FFFFFF; } +//****************************************** @media(max-width: 500px) { .container { width:500px; } - .header-container { flex-wrap: wrap; justify-content:center; } .header .dropdown { - width: 100%; + width: 100%; display: flex; flex-direction: column; margin: 0; align-items: center; padding: 0; } +.jumbotron { + width: 75%; +} - +.subHeaders { + display: flex; + flex-direction: column; } +.right.bottom, .left-bottom { + display: flex; + flex-direction: column; + justify-content: center; +} + .title { + display: flex; + justify-conten: center; + } +} +//************************************************ /*Services Page*/ .services-heading { From 2344271fb700c6d6f9b073bf6804bef82bf9b092 Mon Sep 17 00:00:00 2001 From: Preprocessing - I Date: Fri, 21 Dec 2018 18:25:22 -0500 Subject: [PATCH 71/71] Starting Again, Back to Basics & Grateful --- css/index.css | 26 ++++++-------------------- less/index.less | 33 ++++++++++----------------------- 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/css/index.css b/css/index.css index cb462cb393..2542459ff3 100644 --- a/css/index.css +++ b/css/index.css @@ -151,7 +151,7 @@ table { height: 70px; border-bottom: 1px solid #ffffff; display: flex; - justify-content: flex-start; + justify-content: space-between; align-items: center; background-color: #828282; } @@ -163,20 +163,6 @@ table { font-weight: bold; color: #FFFFFF; } -.header-container { - flex-wrap: wrap; - justify-content: center; -} -.header-container h2 { - justify-content: center; - flex-direction: column; -} -.header-container .dropdown-button { - display: flex; - flex-direction: column; - margin: 0; - align-items: center; -} img { width: 100%; height: auto; @@ -279,6 +265,9 @@ button { font-weight: bold; font-size: 28px; } +.title { + display: flex; +} .right-bottom, .left-bottom { position: absolute; @@ -333,11 +322,7 @@ footer p { .container { width: 500px; } - .header-container { - flex-wrap: wrap; - justify-content: center; - } - .header .dropdown { + .header .dropdown-button { width: 100%; display: flex; flex-direction: column; @@ -359,6 +344,7 @@ footer p { justify-content: center; } .title { + width: 25%; display: flex; justify-conten: center; } diff --git a/less/index.less b/less/index.less index f7d7709591..c71f134ddf 100644 --- a/less/index.less +++ b/less/index.less @@ -78,7 +78,7 @@ table{ height: 70px; border-bottom: 1px solid #ffffff; display: flex; - justify-content: flex-start; + justify-content: space-between; align-items: center; background-color: #828282; } @@ -92,23 +92,6 @@ table{ color:#FFFFFF } - .header-container { - flex-wrap: wrap; - justify-content: center; - } - .header-container h2 { - justify-content: center; - flex-direction: column; - } - - .header-container .dropdown-button { - display: flex; - flex-direction: column; - margin: 0; - align-items: center; - } - - img { width: 100%; height: auto; @@ -225,6 +208,9 @@ button { font-weight: bold; font-size: 28px; } +.title { + display: flex; +} .right-bottom, .left-bottom { position: absolute; @@ -287,12 +273,12 @@ footer p { width:500px; } -.header-container { - flex-wrap: wrap; - justify-content:center; -} +// .header-container { +// flex-wrap: wrap; +// justify-content:center; +// } -.header .dropdown { +.header .dropdown-button { width: 100%; display: flex; flex-direction: column; @@ -315,6 +301,7 @@ footer p { justify-content: center; } .title { + width: 25%; display: flex; justify-conten: center; }