From 270206d8dcd1445e169752810b11b5789cd81728 Mon Sep 17 00:00:00 2001 From: nickkruger Date: Mon, 17 Dec 2018 09:34:22 -0700 Subject: [PATCH 01/19] Forked Repo and setup local IDE --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 17aecb1714..8429e5b0c0 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ You will use Trello to report your progress on the MVP and any extra features yo - Don't overplan, start coding as soon as you can and adjust accordingly. Trello is there as a guide not as a distraction ## Trello Set Up: -* [ ] Create a [Trello account](https://trello.com/) -* [ ] Create a new public board called "S&J Architects - By Your Name" -* [ ] Create lists titled ```backlog```,```To Do```, ```In Progress```, and ```Done``` -* [ ] Fill in the ```To Do``` list with the MVP features listed below -* [ ] Fill in the ```backlog``` list with all the extra features listed below -* [ ] Share your board with the Project Manager that has been assigned to you. If you have not been assigned yet, reach out to your lead TA for guidance +* [x] Create a [Trello account](https://trello.com/) +* [x] Create a new public board called "S&J Architects - By Your Name" +* [x] Create lists titled ```backlog```,```To Do```, ```In Progress```, and ```Done``` +* [x] Fill in the ```To Do``` list with the MVP features listed below +* [x] Fill in the ```backlog``` list with all the extra features listed below +* [x] Share your board with the Project Manager that has been assigned to you. If you have not been assigned yet, reach out to your lead TA for guidance ## Assets Provided: * [Style guide:](/DesignFiles/style-guide.md) This file will help you identify font sizes, colors, and font families across the site. From 8ba59e9f092fc518c31d791a40081264d9e38141 Mon Sep 17 00:00:00 2001 From: nickkruger Date: Mon, 17 Dec 2018 09:35:33 -0700 Subject: [PATCH 02/19] Completed Trello Setup --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8429e5b0c0..acd63721e6 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ You will use Trello to report your progress on the MVP and any extra features yo * [x] Create lists titled ```backlog```,```To Do```, ```In Progress```, and ```Done``` * [x] Fill in the ```To Do``` list with the MVP features listed below * [x] Fill in the ```backlog``` list with all the extra features listed below -* [x] Share your board with the Project Manager that has been assigned to you. If you have not been assigned yet, reach out to your lead TA for guidance +* [x] Share your board with the Project Manager that has been assigned to you. If you have not been assigned yet, reach out to your lead TA for guidance ## Assets Provided: * [Style guide:](/DesignFiles/style-guide.md) This file will help you identify font sizes, colors, and font families across the site. From df699b9e10952dfb552077021e82f1815b894168 Mon Sep 17 00:00:00 2001 From: nickkruger Date: Mon, 17 Dec 2018 14:39:29 -0700 Subject: [PATCH 03/19] Built index.html - html --- index.html | 204 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 124 insertions(+), 80 deletions(-) diff --git a/index.html b/index.html index 8a84a17304..a4348dfcef 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,6 @@ + Home @@ -11,86 +12,129 @@ - -

You got this! Good luck.

- - - - - - - +
+ +
+ +
+ +
+
+
+ +

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

+ +
+
+ architectural drawing +
+
+
+
+

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

+ +
+
+ commercial building with infinity pool +
+
+
+
+

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:

+ +

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 c2c3dedcafd7fb23465c07b167686f811f6e53eb Mon Sep 17 00:00:00 2001 From: nickkruger Date: Mon, 17 Dec 2018 14:58:10 -0700 Subject: [PATCH 04/19] setup less comiler and moved reset in to own less file. --- css/index.css | 136 +++++++++++++++++++++++++++++++++++++++++++++++- less/index.less | 61 +--------------------- less/reset.less | 58 +++++++++++++++++++++ 3 files changed, 195 insertions(+), 60 deletions(-) create mode 100644 less/reset.less diff --git a/css/index.css b/css/index.css index e6b2b589c1..7c6d97c56f 100644 --- a/css/index.css +++ b/css/index.css @@ -1 +1,135 @@ -/* 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; +} diff --git a/less/index.less b/less/index.less index 6d3fc81ef9..21cc91c4c7 100644 --- a/less/index.less +++ b/less/index.less @@ -1,60 +1,3 @@ -/*------------------------------------*\ -RESET -\*------------------------------------*/ -/* http://meyerweb.com/eric/tools/css/reset/ -v2.0b1 | 201101 -NOTE:WORK IN PROGRESS -USE WITH CAUTION AND TEST WITH ABANDON */ +//setup less -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 */ \ No newline at end of file +@import "reset.less"; \ No newline at end of file diff --git a/less/reset.less b/less/reset.less new file mode 100644 index 0000000000..83a4d32775 --- /dev/null +++ b/less/reset.less @@ -0,0 +1,58 @@ +/*------------------------------------*\ +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; +} \ No newline at end of file From 486a40352d58f2e9414d744b0b581c317d426eea Mon Sep 17 00:00:00 2001 From: nickkruger Date: Tue, 18 Dec 2018 08:55:48 -0700 Subject: [PATCH 05/19] Styled header on index.html --- css/index.css | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 2 +- less/global.less | 28 +++++++++++++++++++++++++++ less/header.less | 23 +++++++++++++++++++++++ less/index.less | 10 +++++++++- 5 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 less/global.less create mode 100644 less/header.less diff --git a/css/index.css b/css/index.css index 7c6d97c56f..2b765824d9 100644 --- a/css/index.css +++ b/css/index.css @@ -133,3 +133,52 @@ table { border-collapse: collapse; border-spacing: 0; } +* { + box-sizing: border-box; +} +html { + font-size: 62.5%; +} +html body { + font-family: 'Roboto', Ariel, sans-serif; + max-width: 1024px; + width: 100%; + background-color: #FFFFFF; + color: #222222; + font-size: 1.6em; + line-height: 2.4em; + display: flex; + flex-direction: column; + margin: auto; +} +h1, +h2, +h3, +h4, +h5 { + font-weight: bold; + font-size: 2.8em; +} +header { + position: fixed; + width: 100%; + max-width: 1024px; + margin: auto; + background-color: #828282; + z-index: 100; + display: flex; + justify-content: space-between; +} +header .headerlogo { + color: #FFFFFF; + font-size: 2.4rem; + font-weight: bold; + padding-left: 5%; +} +header .headerImg { + padding-right: 5%; + padding-top: 0.5%; +} +header nav { + display: none; +} diff --git a/index.html b/index.html index a4348dfcef..cfc0127661 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@

S&J

- +