From b5e51d477083d72b8d81e3035b3b2f2c9ee7098e Mon Sep 17 00:00:00 2001 From: Edward Manda Date: Mon, 5 Feb 2018 15:53:49 -0600 Subject: [PATCH 1/3] -a --- project1/.DS_Store | Bin 6148 -> 6148 bytes project1/css/index.css | 78 +++++++++++++++++++++++++++++++++++++++++ project1/index.html | 4 +-- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/project1/.DS_Store b/project1/.DS_Store index e21ee290947432d52662492eb2f95f50f5466f98..5cf6cb9626f926256c9c73da063d58897d987111 100644 GIT binary patch literal 6148 zcmeH~&2G~`5XWbe02?Dj4oL0M7bFf5N|n+cP$erZhu$g~!2wWf*HL5SdaKwWZ9|YR zJOq6M9)&01abRY4K(bq|w2F45-T!{f>}r3>?s@@0jb_OPKo0;kCen_F*$qbhl&)Dz zS}0D@80I+6OpG-e&Y2_N2;6l7w0GNZ3x;#3_@eI*H@B93f3dwi==+<)t>v<- z*Pd?d>>r(8TrNH@zkIX5g2F?J?Xl<|xx#`h?^8ICJ*u~2NHo+2kR0|Nsi1A_p=;M1& diff --git a/project1/css/index.css b/project1/css/index.css index fa13b5178..c395135e6 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -62,3 +62,81 @@ h1, h2, h3, h4, h5 { letter-spacing: 1px; margin-bottom: 10px; } + +.container{ + margin: 0 auto; + width: 900px; +} + +header{ + margin-top: 20px; + margin-bottom: 30px; +} + +header nav li{ + float: left; + margin-right: 40px; + padding: 10px; +} + +header nav ul a { + text-decoration: none; + color: #666; +} + +header nav ul a:hover { + color: #999; +} + +.cta-text { + float: left; + padding: 30px 0 20px 30px; +} + +.cta img { + float: right; + padding: 30px 30px 80px 0; +} + +.cta-text h1 { + font-size: 6em; +} + +.cta-text button { + font-size: 1em; + margin-left: 70px; + padding: 5px 30px; +} + +.top-content{ + margin-top: 30px; + margin-bottom: 20px; +} + +.top-content div{ + float: left; + width: 50%; + padding: 10px 0 30px; +} + +.bottom-content{ + margin-top: 30px; +} + +.bottom-content div { + float: left; + width: 33.333%; + padding: 10px; +} + +.contact { + padding: 10px 0 30px; +} + +.contact p { + padding: 6px; +} + +footer p { + text-align: center; +} \ No newline at end of file diff --git a/project1/index.html b/project1/index.html index b951beaf6..0e6c3d914 100644 --- a/project1/index.html +++ b/project1/index.html @@ -52,7 +52,7 @@

Innovation
On
Demand

Image of a code snippet. - +
@@ -65,7 +65,6 @@

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
@@ -84,6 +83,7 @@

Vision

+
From 031b4745e9bb3f03501eeed4c814f723fcefaa05 Mon Sep 17 00:00:00 2001 From: Edward Manda Date: Tue, 6 Feb 2018 07:34:07 -0600 Subject: [PATCH 2/3] -a --- project1/css/index.css | 100 ++++++++++++++++++++++++----------------- project1/index.html | 3 -- 2 files changed, 60 insertions(+), 43 deletions(-) diff --git a/project1/css/index.css b/project1/css/index.css index c395135e6..6b4df971f 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -68,73 +68,93 @@ h1, h2, h3, h4, h5 { width: 900px; } -header{ - margin-top: 20px; - margin-bottom: 30px; +header { + width: 100%; +} +header nav { + display: inline-block; + margin: 0; } -header nav li{ - float: left; - margin-right: 40px; - padding: 10px; +header nav ul { + margin-right: 0px; } -header nav ul a { - text-decoration: none; - color: #666; +header nav li { + display: inline-block; + padding: 0 10px 2px; + margin: 0 30px 10px 0; } -header nav ul a:hover { - color: #999; +header nav li a { + color: gray; + text-decoration: none; } -.cta-text { - float: left; - padding: 30px 0 20px 30px; +header nav li a:hover { + color: blue; + text-decoration: underline; } -.cta img { - float: right; - padding: 30px 30px 80px 0; +header nav li a:visited { + color: purple; + text-decoration: underline; +} +header .logo { + margin-bottom: -10px; } -.cta-text h1 { - font-size: 6em; +.cta { + margin: 0; + padding: 0; +} +.cta .cta-text { + display: inline-block; + font-size: 76px; + text-align: center; + margin: 0 60px 20px 60px; +} +.cta .cta-text h1 { + margin-bottom: -30px; } -.cta-text button { - font-size: 1em; - margin-left: 70px; +.cta .cta-text button{ padding: 5px 30px; + font-size: 18px; + color: gray; + margin-top: -50px; } - -.top-content{ - margin-top: 30px; - margin-bottom: 20px; +.cta img { + padding-left: 30px; + padding-top: 70px; } -.top-content div{ - float: left; - width: 50%; - padding: 10px 0 30px; +.top-content{ + border-top: 1px solid gray; + margin-top: 40px; + padding-top: 40px; + padding-bottom: 40px; } -.bottom-content{ - margin-top: 30px; +.top-content .text-content{ + display: inline-block; + width: 49%; } -.bottom-content div { - float: left; - width: 33.333%; - padding: 10px; +.bottom-content .text-content{ + display: inline-block; + width: 33%; } -.contact { - padding: 10px 0 30px; +.bottom-content{ + border-bottom: 1px solid gray; + margin-bottom: 40px; + padding-top: 40px; + padding-bottom: 40px; } .contact p { - padding: 6px; + margin-bottom: 20px; } footer p { diff --git a/project1/index.html b/project1/index.html index 0e6c3d914..350ad3087 100644 --- a/project1/index.html +++ b/project1/index.html @@ -52,7 +52,6 @@

Innovation
On
Demand

Image of a code snippet.
-
@@ -83,8 +82,6 @@

Vision

-
-

Contact

From 0e4e905f8a9e88712f3d0ad1d70e9be895a7006f Mon Sep 17 00:00:00 2001 From: Edward Manda Date: Tue, 6 Feb 2018 15:52:26 -0600 Subject: [PATCH 3/3] -a --- project1/css/index.css | 100 ++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 57 deletions(-) diff --git a/project1/css/index.css b/project1/css/index.css index 6b4df971f..290eacb63 100644 --- a/project1/css/index.css +++ b/project1/css/index.css @@ -70,91 +70,77 @@ h1, h2, h3, h4, h5 { header { width: 100%; -} -header nav { - display: inline-block; - margin: 0; + display: flex; + justify-content: space-between; + align-items: center; + margin: 20px 0; } -header nav ul { - margin-right: 0px; -} - -header nav li { - display: inline-block; - padding: 0 10px 2px; - margin: 0 30px 10px 0; +header nav { + flex-grow: 1; } -header nav li a { - color: gray; +header nav ul li a { text-decoration: none; + color: gray; } -header nav li a:hover { - color: blue; +header nav ul li a:hover { text-decoration: underline; + color: blue;; } -header nav li a:visited { - color: purple; - text-decoration: underline; -} -header .logo { - margin-bottom: -10px; +header nav ul { + display: flex; + justify-content: space-around; } .cta { - margin: 0; - padding: 0; + display: flex; + justify-content: space-between; + align-items: center; } -.cta .cta-text { - display: inline-block; - font-size: 76px; - text-align: center; - margin: 0 60px 20px 60px; + +.cta .cta-text{ + flex-grow: 1; + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; } -.cta .cta-text h1 { - margin-bottom: -30px; +.cta .cta-text h1{ + font-size: 76px; } .cta .cta-text button{ - padding: 5px 30px; - font-size: 18px; + font-size: 20px; color: gray; - margin-top: -50px; -} -.cta img { - padding-left: 30px; - padding-top: 70px; + background-color: white; + border: 1px solid gray; } -.top-content{ +.top-content { + display: flex; + justify-content: space-between; border-top: 1px solid gray; - margin-top: 40px; + margin: 40px 0; padding-top: 40px; - padding-bottom: 40px; -} +} -.top-content .text-content{ - display: inline-block; - width: 49%; -} - -.bottom-content .text-content{ - display: inline-block; - width: 33%; -} - -.bottom-content{ +.bottom-content { + display: flex; + justify-content: space-between; border-bottom: 1px solid gray; - margin-bottom: 40px; - padding-top: 40px; + margin: 40px 0; padding-bottom: 40px; +} + +.bottom-content .text-content{ + padding: 10px; } -.contact p { - margin-bottom: 20px; +.contact p{ + padding: 10px 0; } footer p {