From 8667cbd3e5b87361ce1bf55f3e932fe4bc8b70bc Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Fri, 16 Mar 2018 13:17:32 -0700 Subject: [PATCH 01/15] creates framework for site --- index.html | 0 styles/reset.css | 52 +++++++++++++++++++++++++++++++++++++++++++++++ styles/styles.css | 0 3 files changed, 52 insertions(+) create mode 100644 index.html create mode 100644 styles/reset.css create mode 100644 styles/styles.css diff --git a/index.html b/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/styles/reset.css b/styles/reset.css new file mode 100644 index 000000000..f77b0112c --- /dev/null +++ b/styles/reset.css @@ -0,0 +1,52 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v3.0 | 20180413 + 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, +main, 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, main, menu, nav, section { + display: block; +} +/* HTML5 hidden-attribute fix for newer browsers */ +*[hidden] { + display: none; +} +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; +} diff --git a/styles/styles.css b/styles/styles.css new file mode 100644 index 000000000..e69de29bb From f3c883724b44cc8b67efccbd33a247dff4060005 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Fri, 16 Mar 2018 13:27:46 -0700 Subject: [PATCH 02/15] adds links to stylesheets and renames styles folder --- .gitignore | 2 ++ {styles => css}/reset.css | 0 {styles => css}/styles.css | 0 index.html | 13 +++++++++++++ 4 files changed, 15 insertions(+) rename {styles => css}/reset.css (100%) rename {styles => css}/styles.css (100%) diff --git a/.gitignore b/.gitignore index e43b0f988..c6d749175 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .DS_Store +package.json +node_modules diff --git a/styles/reset.css b/css/reset.css similarity index 100% rename from styles/reset.css rename to css/reset.css diff --git a/styles/styles.css b/css/styles.css similarity index 100% rename from styles/styles.css rename to css/styles.css diff --git a/index.html b/index.html index e69de29bb..98b92daab 100644 --- a/index.html +++ b/index.html @@ -0,0 +1,13 @@ + + + + + The Pond's Edge + + + + + + + + From 48ed4d72e1d445f843bfc20e33e0aab7e5f0b7d3 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Fri, 16 Mar 2018 14:32:40 -0700 Subject: [PATCH 03/15] adds basic content, bg color, and google font --- css/styles.css | 4 ++++ index.html | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/css/styles.css b/css/styles.css index e69de29bb..0cd235e51 100644 --- a/css/styles.css +++ b/css/styles.css @@ -0,0 +1,4 @@ +body { + background-color: #c38299; + font-family: 'Slabo 27px', serif; +} diff --git a/index.html b/index.html index 98b92daab..ed852a0de 100644 --- a/index.html +++ b/index.html @@ -3,11 +3,27 @@ The Pond's Edge + + + + +
+

Kate Pond

+

I make the internet

+
+ From 30a7ab455f35dd36e41434f322cc347675c6dd08 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Fri, 16 Mar 2018 15:25:29 -0700 Subject: [PATCH 04/15] adds some style to the nav --- css/styles.css | 32 +++++++++++++++++++++++++++++++- index.html | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 0cd235e51..470fd6d1f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,4 +1,34 @@ body { - background-color: #c38299; font-family: 'Slabo 27px', serif; + color: #424651; +} + +/* Nav */ +nav { + border-bottom: 1px solid #424651; +} + +nav ul { + display: flex; + justify-content: flex-end; + list-style-type: none; + margin: 2% 3%; +} + +.logo { + align-self: flex-start; +} + +nav li { + margin: 0 5%; +} + +nav a { + text-decoration: none; + font-weight: bold; + color: #424651; +} + +nav a:hover { + color: #11bcc3; } diff --git a/index.html b/index.html index ed852a0de..67e73b033 100644 --- a/index.html +++ b/index.html @@ -13,7 +13,7 @@ From e3ed3f44b603a8391d79b22472dad2602da76e93 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Sun, 18 Mar 2018 22:56:54 -0700 Subject: [PATCH 13/15] edits splash page to be a bit more responsive --- css/styles.css | 15 ++++++++------- index.html | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/css/styles.css b/css/styles.css index 3db01f5a9..ef2cdb97f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -22,7 +22,6 @@ nav ul { justify-content: flex-end; align-items: center; list-style-type: none; - margin: 1% 2%; } .logo { @@ -30,8 +29,9 @@ nav ul { } .logo img { - height: 50%; - width: 50%; + height: 30%; + width: 30%; + margin: 2% } nav li { @@ -58,8 +58,9 @@ nav a:hover { } .splash img { - float: left; - margin-right: 10%; - height: 55%; - width: 55%; + width: 700px; +} + +.splash-text { + flex: 1; } diff --git a/index.html b/index.html index 067be2721..09b1427c2 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,7 @@
The Pond's Edge Logo -
+

Owner & CEO extraordinaire

Kate Pond

I make the internet

From 43edb0ed8814c19c16cd96fc9b4df6be51b90e28 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Fri, 30 Mar 2018 10:31:42 -0700 Subject: [PATCH 14/15] adds and begins work on the work page --- content/work.html | 70 +++++++++++++++++++++++++++++++++++++++++++++++ css/work.css | 17 ++++++++++++ index.html | 2 +- 3 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 content/work.html create mode 100644 css/work.css diff --git a/content/work.html b/content/work.html new file mode 100644 index 000000000..96db42a8e --- /dev/null +++ b/content/work.html @@ -0,0 +1,70 @@ + + + + + Work + + + + + + + + + + + +
+
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ Placeholder alt +

Piece Header

+

This is some placeholder text.

+
+ +
+ + + diff --git a/css/work.css b/css/work.css new file mode 100644 index 000000000..c0e7660c2 --- /dev/null +++ b/css/work.css @@ -0,0 +1,17 @@ +.nav-work{ + color: #11bcc3; +} + +.work { + display: grid; + grid-template-columns: repeat(3, 1fr); + grid-template-rows: repeat(3, auto); + justify-content: space-around; + justify-items: center; + grid-row-gap: 25px; + grid-auto-flow: row; + margin: 30px 0; +} + +article { +} diff --git a/index.html b/index.html index 09b1427c2..71aecdb8a 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@