From ba14cd90d898d73b6fb6cd1f6d6f81d72cff5ee6 Mon Sep 17 00:00:00 2001 From: janniks Date: Sun, 28 Oct 2018 21:49:33 +0100 Subject: [PATCH 1/6] Add stub family section --- _config.yml | 2 +- _includes/google-analytics.html | 2 +- _sass/minima/_layout.scss | 50 +++++++++++++++++++-------------- index.html | 35 +++++++++++++++++++++-- 4 files changed, 64 insertions(+), 25 deletions(-) diff --git a/_config.yml b/_config.yml index da9713f..9538362 100644 --- a/_config.yml +++ b/_config.yml @@ -3,7 +3,7 @@ email: hello@webundspeck.com url: https://webundspeck.github.io description: >- - web & speck is a community of developers, designers, tech-enthusiasts and + web & speck is a community of developers, designers, tech-enthusiasts and tech-startups in Innsbruck. facebook_username: webundspeck diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html index e9afb20..ddd7070 100644 --- a/_includes/google-analytics.html +++ b/_includes/google-analytics.html @@ -9,4 +9,4 @@ ga('send', 'pageview'); } - + diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index 7477836..ded8931 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -122,27 +122,6 @@ .wrapper { position: relative; } - - // .site-nav { - // position: absolute; - // top: 0; - // left: 0; - // width: 100%; - - // .site-nav-links { - // width: fit-content; - // margin: auto; - - // .page-link { - // color: $text-color; - // line-height: $base-line-height; - - // &:not(:last-child) { - // margin-right: 20px; - // } - // } - // } - // } } @@ -255,6 +234,35 @@ @include relative-font-size(1.5); } +hr { + margin: 16px 0; + border: 1px solid #ddd; +} + + + +/** + * Family Section + */ +.family { + .family-row { + text-align: center; + + .family-member { + display: inline-block; + margin: 0 16px 16px 16px; + + img { + display: block; + margin: 8px 0; + width: 160px; + height: 160px; + border-radius: 50%; + } + } + } +} + /** diff --git a/index.html b/index.html index ff65f8d..0457c47 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,38 @@

You would like to contribute or have a job listing that we should post? Just contact us at {{ site.email }} or get in touch with one of the organisers below.

-
- +
+ +
+
+ +
+ +
+

Family

+ +
+
+ + Random Person +
+
+ + Random Person +
+
+ + Random Person +
+
+
+
+ + Random Person +
+
+ + Random Person +
From 81ccb54371c7d67b0447acceac2a312b75fc5913 Mon Sep 17 00:00:00 2001 From: janniks Date: Sun, 28 Oct 2018 21:49:57 +0100 Subject: [PATCH 2/6] Add line break --- index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.html b/index.html index 0457c47..50a0ff2 100644 --- a/index.html +++ b/index.html @@ -45,3 +45,5 @@

Family

+ +
From f31defc4d90d32591f7e0480d3213505309afe3e Mon Sep 17 00:00:00 2001 From: janniks Date: Sun, 28 Oct 2018 22:06:44 +0100 Subject: [PATCH 3/6] Add social icons to family section --- _sass/minima/_layout.scss | 57 +++++++++++++++++++++++++-------------- index.html | 20 ++++++++++---- 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index ded8931..2fb2dca 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -94,33 +94,42 @@ display: inline-block; margin: 4px; } + } - .fas { - color: #CCC; + .wrapper { + position: relative; + } +} - -webkit-transition: color 0.35s; - -moz-transition: color 0.35s; - -o-transition: color 0.35s; - transition: color 0.35s; - } - a:hover { - .cfa-facebook .fas { - color: #3B5998; - } - .cfa-twitter .fas { - color: #1DA1F2; - } +/** + * Site Icons + */ +.fas, .fab { + color: #CCC; - .cfa-meetup .fas { - color: #e51937; - } - } + -webkit-transition: color 0.35s; + -moz-transition: color 0.35s; + -o-transition: color 0.35s; + transition: color 0.35s; +} + +a:hover { + .fab.fa-facebook, .cfa-facebook .fas { + color: #3B5998; } - .wrapper { - position: relative; + .fab.fa-linkedin, .cfa-linkedin .fas { + color: #0077B5; + } + + .fab.fa-twitter, .cfa-twitter .fas { + color: #1DA1F2; + } + + .fab.fa-meetup, .cfa-meetup .fas { + color: #e51937; } } @@ -252,6 +261,14 @@ hr { display: inline-block; margin: 0 16px 16px 16px; + .fas { + color: #ccc; + } + + a { + text-decoration: none; + } + img { display: block; margin: 8px 0; diff --git a/index.html b/index.html index 50a0ff2..57e0810 100644 --- a/index.html +++ b/index.html @@ -23,25 +23,35 @@

Family

- Random Person +
Random Person
+ +
- Random Person +
Random Person
+ +
- Random Person +
Random Person
+ +
- Random Person +
Random Person
+ +
- Random Person +
Random Person
+ +
From 4be542ac164d70382393443fd06a0c0ddd95f31e Mon Sep 17 00:00:00 2001 From: janniks Date: Wed, 31 Oct 2018 10:13:12 +0100 Subject: [PATCH 4/6] Adjust image size --- _sass/minima/_layout.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index 2fb2dca..6f157e5 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -259,7 +259,7 @@ hr { .family-member { display: inline-block; - margin: 0 16px 16px 16px; + margin: 0 20px 8px 20px; .fas { color: #ccc; @@ -271,9 +271,9 @@ hr { img { display: block; - margin: 8px 0; - width: 160px; - height: 160px; + margin: 16px 0; + width: 128px; + height: 128px; border-radius: 50%; } } From b58edb2c53cdcd33ca8ca55d310437d0f83aeb6d Mon Sep 17 00:00:00 2001 From: janniks Date: Wed, 31 Oct 2018 10:16:00 +0100 Subject: [PATCH 5/6] Fix social icon hover color --- _sass/minima/_layout.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index 6f157e5..5b1691d 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -116,19 +116,19 @@ } a:hover { - .fab.fa-facebook, .cfa-facebook .fas { + & > .fab.fa-facebook, .cfa-facebook .fas { color: #3B5998; } - .fab.fa-linkedin, .cfa-linkedin .fas { + & > .fab.fa-linkedin, .cfa-linkedin .fas { color: #0077B5; } - .fab.fa-twitter, .cfa-twitter .fas { + & > .fab.fa-twitter, .cfa-twitter .fas { color: #1DA1F2; } - .fab.fa-meetup, .cfa-meetup .fas { + & > .fab.fa-meetup, .cfa-meetup .fas { color: #e51937; } } From 3b2f74516013e0c80a795e9892c1cab09a00c551 Mon Sep 17 00:00:00 2001 From: janniks Date: Sat, 1 Dec 2018 18:34:32 +0100 Subject: [PATCH 6/6] Add friends section --- _sass/minima/_base.scss | 9 +++++++++ _sass/minima/_layout.scss | 30 +++++++++++++++++++++++++++- index.html | 41 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) diff --git a/_sass/minima/_base.scss b/_sass/minima/_base.scss index e61b0be..f330347 100644 --- a/_sass/minima/_base.scss +++ b/_sass/minima/_base.scss @@ -30,6 +30,15 @@ body { +/** + * Set heading font style + */ +h1, h2, h3, h4, h5, h6 { + font-family: "Londrina Solid", sans-serif; +} + + + /** * Set `margin-bottom` to maintain vertical rhythm */ diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index 5b1691d..385e16c 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -62,7 +62,7 @@ transition: border 1s; &.sticky { - position: fixed; + position: sticky; top: 0; width: 100%; @@ -282,6 +282,34 @@ hr { +/** + * Friends Section + */ +.friends { + .friends-row { + text-align: center; + + .friends-member { + display: inline-block; + margin: 0 20px 8px 20px; + + a { + text-decoration: none; + } + + img { + display: block; + margin: 16px 0; + width: 96px; + height: 96px; + border-radius: 50%; + } + } + } +} + + + /** * Posts */ diff --git a/index.html b/index.html index 57e0810..70f7415 100644 --- a/index.html +++ b/index.html @@ -57,3 +57,44 @@

Family

+ +
+

Friends

+ +
+
+ + +
Random Company
+ +
+
+ + +
Random Company
+ +
+
+ + +
Random Company
+ +
+
+
+
+ + +
Random Company
+ +
+
+ + +
Random Company
+ +
+
+
+ +