From 8eeb6d1831c6b88b5e99c801b4d8a55ec882f413 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Mon, 5 Feb 2018 15:53:09 -0600 Subject: [PATCH 1/9] Completed Challenge 1 --- project1/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project1/index.html b/project1/index.html index b951beaf6..4b532b5d0 100644 --- a/project1/index.html +++ b/project1/index.html @@ -39,10 +39,13 @@
  • Contact
    • +
  • + +
    • - +
    From 0540bcf457a552448fdf35b4107c09c3d13d1941 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Mon, 5 Feb 2018 15:53:31 -0600 Subject: [PATCH 2/9] Completed Challenge 1 --- project1/css/index.css | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/project1/css/index.css b/project1/css/index.css index fa13b5178..946eb61ed 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -62,3 +62,78 @@ h1, h2, h3, h4, h5 { letter-spacing: 1px; margin-bottom: 10px; } + +nav ul { + display: flex; + justify-content: space-around; + align-items: center; + margin-top: 5px; +} + +nav ul a { + text-decoration: none; + color: gray; +} + +.logo { + float: right; +} + + +.cta { + display: flex; + justify-content: space-around; + align-items: center; + margin-top: 50px; + padding-bottom: 40px; + border-bottom: 1px solid black; +} + +.cta .cta-text { + font-size: 80px; + text-align: center; +} + +.cta .cta-text button { + background-color: white; + width: 200px; + height: 40px; + outline: none; + border: solid black 2px; + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + font-size: 15px; +} + +.top-content { + display: flex; + margin-top: 40px; +} + +.top-content .text-content { + padding: 0px 30px 15px 30px; +} + +.main-content img { + display: block; + margin-left: auto; + margin-right: auto; + width: 95%; + height: 160px; + margin-bottom: 15px; +} + +.bottom-content { + display: flex; + margin-top: 25px; + padding: 20px 20px 30px 20px; + border-bottom: solid black 1px; +} + +.contact { + display: flex; + flex-direction: column; + justify-content: space-around; + align-content: left; + height: 180px; + margin-top: 30px; +} \ No newline at end of file From 1318d39eaad87373a9ef0ab25973436a308caad5 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Mon, 5 Feb 2018 17:31:31 -0600 Subject: [PATCH 3/9] Challenge 1 Solved using Box Model Properties (No Flexbox) --- project1/new_index.html | 111 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 project1/new_index.html diff --git a/project1/new_index.html b/project1/new_index.html new file mode 100644 index 000000000..0730313f1 --- /dev/null +++ b/project1/new_index.html @@ -0,0 +1,111 @@ + + + + + + + Great Idea! + + + + + + + + + +
    + +
    + + + +
    + +
    +
    +

    Innovation
    On
    Demand

    + +
    + Image of a code snippet. +
    + +
    + +
    +
    +

    Features

    +

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

    +
    +
    +

    About

    +

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

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

    Services

    +

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

    +
    +
    +

    Product

    +

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

    +
    +
    +

    Vision

    +

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

    +
    +
    + +
    + +
    + +

    Contact

    +
    +

    123 Way 456 Street
    + Somewhere, USA

    +
    +

    1 (888) 888-8888

    +
    +

    sales@greatidea.io

    + +
    +
    +
    +
    +

    Copyright Great Idea! 2018

    +
    + +
    + + + + + \ No newline at end of file From 2038bf55eb50bd5dc367fdaf9ebebdfc47fbbcbe Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Mon, 5 Feb 2018 17:32:38 -0600 Subject: [PATCH 4/9] Finished Challenge 1 using Box Model Properties (No Flexbox) --- project1/css/new_index.css | 159 +++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 project1/css/new_index.css diff --git a/project1/css/new_index.css b/project1/css/new_index.css new file mode 100644 index 000000000..8468578e0 --- /dev/null +++ b/project1/css/new_index.css @@ -0,0 +1,159 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* 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; +} +table { + border-collapse: collapse; + border-spacing: 0; +} + +/* Set every element's box-sizing to border-box */ +* { + box-sizing: border-box; +} + +html, body { + height: 100%; + font-family: 'Titillium Web', sans-serif; +} + +h1, h2, h3, h4, h5 { + font-family: 'Bangers', cursive; + letter-spacing: 1px; + margin-bottom: 10px; +} + +header { + height: 200px; +} +header nav ul { + display: inline-block; + width: 85%; + margin: 20px 0px 20px 40px; +} + +header nav ul li { + display: inline-block; + margin: 20px 50px 0px 50px; +} + +header img { + float: right; + margin: -60px 100px 0px 30px; + width: 220px; + height: 60px; +} + +header nav ul li a { + text-decoration: none; + color: gray; +} + +header nav ul li a:hover { + text-decoration: none; +} + +.cta { + width: 100%; + height: 400px; + border-bottom: solid black 1px; + +} +.cta .cta-text { + display: inline-block; + font-size: 90px; + position: relative; + text-align: center; + top: -60px; + left: 160px; + +} + +.cta .cta-text button { + background-color: white; + width: 210px; + height: 40px; + border: solid black 1px; + font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + position: relative; + top: -40px; +} + +.cta img { + float: right; + position: relative; + right: 140px; + bottom: 80px; +} + +.top-content .text-content { + display: inline-block; + position: relative; + left: 20px; + top: 10px; + width: 45%; + margin-bottom: 50px; +} + +.main-content img { + width: 96%; + position: relative; + left: 2%; + margin-bottom: 30px; +} + +.bottom-content .text-content { + display: inline-block; + position: relative; + left: 10px; + top: 10px; + width: 30%; + margin-bottom: 25px; + padding-bottom: 25px; + border-bottom: solid black 1px; +} + +footer { + text-align: center; +} + From 8ef9980ef52d50705ebf3564b176bc0e9f6a3770 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Mon, 5 Feb 2018 18:50:48 -0600 Subject: [PATCH 5/9] Updated HTML to include linebreaks and centered footer --- project1/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project1/index.html b/project1/index.html index 4b532b5d0..a17c80b57 100644 --- a/project1/index.html +++ b/project1/index.html @@ -100,7 +100,9 @@

    Contact

    sales@greatidea.io

    - +
    +
    +
    From a0fd836a042949b493d9c22c6aa08f5e0abcfc91 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Mon, 5 Feb 2018 18:51:09 -0600 Subject: [PATCH 6/9] Updated CSS to include centered footer --- project1/css/index.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/project1/css/index.css b/project1/css/index.css index 946eb61ed..d5eebbc33 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -136,4 +136,10 @@ nav ul a { align-content: left; height: 180px; margin-top: 30px; +} + +footer { + display: flex; + align-content: center; + justify-content: center; } \ No newline at end of file From f6a2df6e4304d817a174d148b534261654ecaee6 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Tue, 6 Feb 2018 16:41:52 -0600 Subject: [PATCH 7/9] Corrected border to better resemble model question and aligned contact info with other content. --- project1/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project1/index.html b/project1/index.html index a17c80b57..bcb8f2f77 100644 --- a/project1/index.html +++ b/project1/index.html @@ -47,7 +47,7 @@ - +

    Innovation
    On
    Demand

    @@ -55,7 +55,7 @@

    Innovation
    On
    Demand

    Image of a code snippet.
    - +
    @@ -87,7 +87,7 @@

    Vision

    - +

    Contact

    From 942c61607dd12e18e809797f86a6c1aaa02e7b46 Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Tue, 6 Feb 2018 16:42:40 -0600 Subject: [PATCH 8/9] Corrected border to better resemble model question and aligned contact info with other content --- project1/css/index.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/project1/css/index.css b/project1/css/index.css index d5eebbc33..12aabe695 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -86,7 +86,13 @@ nav ul a { align-items: center; margin-top: 50px; padding-bottom: 40px; +} + +.shortborder { border-bottom: 1px solid black; + width: 90%; + position: relative; + left: 5%; } .cta .cta-text { @@ -126,7 +132,6 @@ nav ul a { display: flex; margin-top: 25px; padding: 20px 20px 30px 20px; - border-bottom: solid black 1px; } .contact { @@ -136,6 +141,7 @@ nav ul a { align-content: left; height: 180px; margin-top: 30px; + padding-left: 20px; } footer { From ef4788c068bcf9026cf0d7d24e98b2b5c2cb845f Mon Sep 17 00:00:00 2001 From: Daniel Plott Date: Tue, 6 Feb 2018 16:47:03 -0600 Subject: [PATCH 9/9] Corrected border size error overlooked in last commit --- project1/css/index.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project1/css/index.css b/project1/css/index.css index 12aabe695..193f65a7f 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -90,9 +90,9 @@ nav ul a { .shortborder { border-bottom: 1px solid black; - width: 90%; + width: 96%; position: relative; - left: 5%; + left: 2%; } .cta .cta-text {