fix missing team names

update team list layout
CSSclasses · Sep 9, 2016 · 6c8574e · 6c8574e
1 parent 45ab609
commit 6c8574e
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 45 deletions.
diff --git a/_data/coaches/berlin.yml b/_data/coaches/berlin.yml
@@ -1,46 +1,43 @@
-- name: Max Fellmuth
-  twitter: maxfell
-  github: maxfell
-
-- name: Łukasz Kliś
-  twitter: lukaszklis
-  github: lukaszklis
+- name: Lucie Höhler
+  twitter: autofocus
 
 - name: Nika Zawila
   twitter: nikazawila
   github: nikazawila
 
+- name: Stefan Judis
+  twitter: stefanjudis
+  github: stefanjudis
+
 - name: Rafal Bromirski
   twitter: paranoida
   github: paranoida
 
+- name: Robin Pokorný
+  twitter: robinpokorny
+  github: robinpokorny
+
+- name: Max Fellmuth
+  twitter: maxfell
+  github: maxfell
+
 - name: Jessica Jordan
+  twitter: jjordan_dev
+  github: jessica-jordan
 
 - name: Lisa Passing
-  twitter: lisapassing
   github: lislis
 
-- name: Cath Richardson
-  twitter: ohrworm
-
-- name: Mariusz Cieśla
-  twitter: dotmariusz
-  github: mariusz
-
-- name: Lucie Höhler
-  twitter: autofocus
-
 - name: Nico Hagenburger
   twitter: hagenburger
   github: hagenburger
 
 - name: Ferdinand Vogler
   twitter: ferdinandvogler
 
-- name: Robin Pokorný
-  twitter: robinpokorny
-  github: robinpokorny
+- name: Cath Richardson
+  twitter: ohrworm
 
-- name: Stefan Judis
-  twitter: stefanjudis
-  github: stefanjudis
+- name: Mariusz Cieśla
+  twitter: dotmariusz
+  github: mariusz
diff --git a/_data/teams/berlin.yml b/_data/teams/berlin.yml
@@ -1,16 +1,22 @@
-- name: Kristina Schneider
+- name: 'Kristina Schneider'
   image-file-name: berlin/schneider-kristina.jpg
   twitter: kriesse
   github: Kriesse
   website: http://www.kristinaschneider.com
 
-- name: Kevin Lorenz
+- name: 'Kevin Lorenz'
   image-file-name: berlin/lorenz-kevin.jpg
   twitter: verpixelt
   github: verpixelt
   website: http://kevinlorenz.com
 
-- name: Bastian Albers
+- name: 'Bastian Albers'
   image-file-name: berlin/albers-bastian.jpg
   twitter: bastianalbers
   github: bastianalbers
+
+- name: 'Łukasz Kliś'
+  image-file-name: berlin/klis-lukasz.jpg
+  twitter: lukaszklis
+  github: lukaszklis
+  website: https://lukasz.klis.co/
diff --git a/_data/teams/hamburg.yml b/_data/teams/hamburg.yml
@@ -5,24 +5,24 @@
   website: http://jonas.re
 
 - name: Klaus Trainer
-  image-file-name: hamburg/trainer-klaus.png
+  image-file-name: hamburg/trainer-klaus.jpg
   twitter: KlausTrainer
   github: KlausTrainer
 
 - name: Leonard Koch
-  image-file-name: hamburg/koch-leonard.png
+  image-file-name: hamburg/koch-leonard.jpg
   twitter: LeonardKoch_
   github: leonardkoch
   website: http://leonardkoch.com
 
 - name: Markus Bertling
-  image-file-name: hamburg/bertling-markus.png
+  image-file-name: hamburg/bertling-markus.jpg
   twitter: HerrBertling
   github: HerrBertling
   website: http://www.herrbertling.de
 
 - name: Stefan Schult
-  image-file-name: hamburg/schult-stefan.png
+  image-file-name: hamburg/schult-stefan.jpg
   twitter: schubidu
   github: Schubidu
 

diff --git a/_includes/team-element.html b/_includes/team-element.html
@@ -1,7 +1,7 @@
 <div class="user">
     <img class="user__img" src="{{ site.baseurl }}/assets/images/team/{{ include.image-file-name }}" alt="">
     <div class="user-data">
-        <span class="user__text delta">{{ include.name }}</span>
+        <span class="user__text epsilon">{{ include.name }}</span>
         <ul class="list-simple user__list">
             {% if include.twitter %}
             <li class="list-simple__el--is-horizontal">
@@ -20,4 +20,4 @@
             {% endif %}
         </ul>
     </div>
-</div>
+</div>
diff --git a/_sass/_typography.scss b/_sass/_typography.scss
@@ -60,6 +60,15 @@ h4,
   margin-bottom: $base-unit;
 }
 
+
+h5,
+.epsilon {
+  font-size: 1em;
+  letter-spacing: .01em;
+  line-height: 1.249876543;
+  margin-bottom: $base-unit;
+}
+
 small,
 %small {
   font-size: .666666667em;

diff --git a/_sass/_visuals.scss b/_sass/_visuals.scss
@@ -1,14 +1,13 @@
 
 
 .icon {
-  width: 32px;
-  height: 32px;
+  width: 24px;
+  height: 24px;
   background-repeat: no-repeat;
   background-size: 100% auto;
   background-position: 0 0;
-  transition: background-position 0.4s;
 
-  &:hover { background-position: 0 -36px;}
+  &:hover { background-position: 0 -27px;}
 }
 
 .icon-only {

diff --git a/_sass/modules/_m-user.scss b/_sass/modules/_m-user.scss
@@ -5,22 +5,26 @@ $module-namespace: 'user';
 .flex-row {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
+  justify-content: center;
   flex-wrap: wrap;
+  margin-left: -$base-unit;
+  margin-right: -$base-unit;
 }
 
 .#{$module-namespace} {
-  flex: 1 1 220px;
+  flex: 1 1 50%;
   display: flex;
   flex-direction: column;
   align-items: center;
-  max-width: 330px;
+  max-width: 180px;
+  padding-left: $base-unit;
+  padding-right: $base-unit;
+  @include bp(x) { flex-basis: 25%; }
+
 }
 
 .#{$module-namespace}__img {
-  border-radius: 50%;
   width: 100%;
-  max-width: 80%;
   margin-bottom: $base-unit;
 }
 
@@ -29,6 +33,5 @@ $module-namespace: 'user';
   text-transform: uppercase;
   position: relative;
   display: block;
-  padding-left: $base-unit;
   margin-bottom: .5 * $base-unit;
 }
diff --git a/about.html b/about.html
@@ -16,7 +16,7 @@ <h3>Team</h3>
 
         <div class="flex-row">
             {% for member in site.data.teams[city.key] %}
-                {% include team-element.html image-file-name=member.image-file-name twitter=member.twitter github=member.github website=member.website %}
+                {% include team-element.html name=member.name image-file-name=member.image-file-name twitter=member.twitter github=member.github website=member.website %}
             {% endfor %}
         </div>
 
@@ -30,4 +30,4 @@ <h3>Coaches</h3>
         {% endif %}
 
     {% endfor %}
-</section>
+</section>