From ea2213d171619e06837e6b175dd1599df8d1dbd5 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 30 Aug 2017 18:43:08 +0200 Subject: [PATCH] add social icons, add contact data to contact page --- _config.yml | 15 ++---- _src/_assets/img/icon-email.svg | 5 ++ _src/_assets/img/icon-facebook.svg | 3 ++ _src/_assets/img/icon-github.svg | 3 ++ _src/_assets/img/icon-linkedin.svg | 3 ++ _src/_assets/img/icon-twitter.svg | 3 ++ _src/_assets/scss/_board.scss | 8 +++- _src/_assets/scss/_forms.scss | 11 +++-- _src/_assets/scss/_icons.scss | 13 ++++++ _src/_assets/scss/_typography.scss | 1 + _src/_assets/scss/ipdb.scss | 28 +++++++++++ _src/_assets/scss/page-contact.scss | 6 +++ _src/_data/contact.yml | 20 ++++++++ _src/_includes/board.html | 7 ++- _src/_includes/form-contact.html | 72 +++++++++++++++++++++-------- _src/_includes/menu-foundation.html | 2 +- _src/contact.md | 1 + _src/index.html | 22 ++++++++- 18 files changed, 185 insertions(+), 38 deletions(-) create mode 100644 _src/_assets/img/icon-email.svg create mode 100644 _src/_assets/img/icon-facebook.svg create mode 100644 _src/_assets/img/icon-github.svg create mode 100644 _src/_assets/img/icon-linkedin.svg create mode 100644 _src/_assets/img/icon-twitter.svg create mode 100644 _src/_assets/scss/_icons.scss create mode 100644 _src/_assets/scss/page-contact.scss create mode 100644 _src/_data/contact.yml diff --git a/_config.yml b/_config.yml index b3ebe75..93d3819 100644 --- a/_config.yml +++ b/_config.yml @@ -3,23 +3,18 @@ title: "IPDB" description: "The Interplanetary Database." url: "https://ipdb.io" -email: "contact@ipdb.io" - -github: - org: "ipdb" - repo: "site" analyticsID: "" typekitID: "bko7hwo" signup: - button: Sign up for free (testnet) - button_short: Sign up - link: https://developers.ipdb.io/signup?plan_ids[]=2357355879577 + button: "Sign up for free (testnet)" + button_short: "Sign up" + link: "https://developers.ipdb.io/signup?plan_ids[]=2357355879577" login: - button: Log in - link: https://developers.ipdb.io/login + button: "Log in" + link: "https://developers.ipdb.io/login" # Form actions forms: diff --git a/_src/_assets/img/icon-email.svg b/_src/_assets/img/icon-email.svg new file mode 100644 index 0000000..7bf7f21 --- /dev/null +++ b/_src/_assets/img/icon-email.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/_src/_assets/img/icon-facebook.svg b/_src/_assets/img/icon-facebook.svg new file mode 100644 index 0000000..c88cbd7 --- /dev/null +++ b/_src/_assets/img/icon-facebook.svg @@ -0,0 +1,3 @@ + + + diff --git a/_src/_assets/img/icon-github.svg b/_src/_assets/img/icon-github.svg new file mode 100644 index 0000000..255ad3c --- /dev/null +++ b/_src/_assets/img/icon-github.svg @@ -0,0 +1,3 @@ + + + diff --git a/_src/_assets/img/icon-linkedin.svg b/_src/_assets/img/icon-linkedin.svg new file mode 100644 index 0000000..94366bf --- /dev/null +++ b/_src/_assets/img/icon-linkedin.svg @@ -0,0 +1,3 @@ + + + diff --git a/_src/_assets/img/icon-twitter.svg b/_src/_assets/img/icon-twitter.svg new file mode 100644 index 0000000..12c44af --- /dev/null +++ b/_src/_assets/img/icon-twitter.svg @@ -0,0 +1,3 @@ + + + diff --git a/_src/_assets/scss/_board.scss b/_src/_assets/scss/_board.scss index 23784bb..c291255 100644 --- a/_src/_assets/scss/_board.scss +++ b/_src/_assets/scss/_board.scss @@ -44,9 +44,15 @@ $avatar-size: 100px; text-align: center; a { - display: block; + display: inline-block; + margin: 0 $spacer / 4; } } + + .icon { + width: $font-size-small; + height: $font-size-small; + } } .boardmember__bio { diff --git a/_src/_assets/scss/_forms.scss b/_src/_assets/scss/_forms.scss index 5d1e6ec..7b935c6 100644 --- a/_src/_assets/scss/_forms.scss +++ b/_src/_assets/scss/_forms.scss @@ -93,12 +93,13 @@ border-color: $brand-failure; } } -} -textarea { - // for textarea-autogrow - resize: none; - box-sizing: content-box; + &textarea { + // for textarea-autogrow + resize: none; + box-sizing: content-box; + max-width: 95%; + } } .form__help { diff --git a/_src/_assets/scss/_icons.scss b/_src/_assets/scss/_icons.scss new file mode 100644 index 0000000..7588086 --- /dev/null +++ b/_src/_assets/scss/_icons.scss @@ -0,0 +1,13 @@ +.icon { + fill: $brand-01; + stroke: none; + width: $font-size-small; + height: $font-size-small; + vertical-align: baseline; + margin-bottom: -.05rem; +} + +.icon--sm { + width: .5rem; + height: .5rem; +} diff --git a/_src/_assets/scss/_typography.scss b/_src/_assets/scss/_typography.scss index 1f423ec..4692015 100644 --- a/_src/_assets/scss/_typography.scss +++ b/_src/_assets/scss/_typography.scss @@ -107,6 +107,7 @@ strong { a { color: $link-color; text-decoration: none; + transition: .15s ease-out; &:hover, &:focus { diff --git a/_src/_assets/scss/ipdb.scss b/_src/_assets/scss/ipdb.scss index 4c51323..d2ae09f 100644 --- a/_src/_assets/scss/ipdb.scss +++ b/_src/_assets/scss/ipdb.scss @@ -8,6 +8,7 @@ @import 'forms'; @import 'code'; @import 'media'; +@import 'icons'; @import 'sections'; @import 'header'; @import 'menus'; @@ -18,3 +19,30 @@ .content--page--markdown { padding-top: $spacer * 2; } + +.social-list { + margin: 0; + padding: 0; + + li { display: inline; } + + a { + display: inline-block; + padding: $spacer / 4 0; + margin: 0 $spacer / 2; + + &:hover, + &:focus { + transform: translateY(-1px); + } + + &:active { + transform: translateY(0); + } + } + + .icon { + width: $font-size-base; + height: $font-size-base; + } +} diff --git a/_src/_assets/scss/page-contact.scss b/_src/_assets/scss/page-contact.scss new file mode 100644 index 0000000..9a310f0 --- /dev/null +++ b/_src/_assets/scss/page-contact.scss @@ -0,0 +1,6 @@ +@import 'variables'; + +.company__name { + font-size: $font-size-large; + margin-bottom: $spacer / 4; +} diff --git a/_src/_data/contact.yml b/_src/_data/contact.yml new file mode 100644 index 0000000..b7768d4 --- /dev/null +++ b/_src/_data/contact.yml @@ -0,0 +1,20 @@ +name: "IPDB Foundation e.V." +address: + street: "Wichertstraße 14a" + zip: "10439" + city: "Berlin" + country: "Germany" +email: "contact@ipdb.io" + +# All the social links +social: + - name: "Twitter" + link: "https://twitter.com/ipdbfoundation" + - name: "Facebook" + link: "https://facebook.com/ipdbfoundation" + - name: "LinkedIn" + link: "https://www.linkedin.com/company/7963161" + - name: "GitHub" + link: "https://github.com/ipdb" + org: "ipdb" + repo: "site" diff --git a/_src/_includes/board.html b/_src/_includes/board.html index fc9dc1c..617540c 100644 --- a/_src/_includes/board.html +++ b/_src/_includes/board.html @@ -21,7 +21,12 @@ {% if member.social %}

{% for item in member.social %} - {{ item.name }} + + + {{ item.name }} + + + {% endfor %}

{% endif %} diff --git a/_src/_includes/form-contact.html b/_src/_includes/form-contact.html index a64e6ff..b84efdb 100644 --- a/_src/_includes/form-contact.html +++ b/_src/_includes/form-contact.html @@ -1,20 +1,56 @@ -
-
- - +
+
+ + +
+ + +
+
+ + +
+
+ + +
+

+ Fields marked with an * are required. +

+
+ +
+ +
-
- - +
+

+ + {% assign contact = site.data.contact %} + +
+

{{ contact.name }}

+

+ {{ contact.email }} +

+

+ {{ contact.address.street }}
+ {{ contact.address.zip }} {{ contact.address.city }}
+ {{ contact.address.country }} +

+
+ +
-
- - -
-

- Fields marked with an * are required. -

-
- -
- +
diff --git a/_src/_includes/menu-foundation.html b/_src/_includes/menu-foundation.html index 33975c5..32c6bf9 100644 --- a/_src/_includes/menu-foundation.html +++ b/_src/_includes/menu-foundation.html @@ -18,7 +18,7 @@ {% endif %} {% unless page.path contains 'foundation/index' %} - {{ page.title }} → + {{ page.title }} {% endunless %} {% endif %} {% endfor%} diff --git a/_src/contact.md b/_src/contact.md index 34e5a70..b821708 100644 --- a/_src/contact.md +++ b/_src/contact.md @@ -5,6 +5,7 @@ title: Contact subtitle: Get in touch with IPDB Foundation narrow: true +css: page-contact --- ## Get in touch diff --git a/_src/index.html b/_src/index.html index b65600d..5bdc421 100644 --- a/_src/index.html +++ b/_src/index.html @@ -136,8 +136,13 @@ css: page-front
-

{{ content.roadmap.title }}

-

{{ content.roadmap.description }}

+
+
+

{{ content.roadmap.title }}

+

{{ content.roadmap.description }}

+
+
+
@@ -212,6 +217,19 @@ css: page-front