Merge branch 'master' of https://github.com/nos/website

components/Team/Card/Card.scss

@@ -2,7 +2,7 @@
   width: 30%;
   text-align: center;
   font-size: 14px;
-  margin-top: 40px;
+  margin-top: 72px;
 
   &:last-child {
     margin-bottom: 40px;
@@ -17,6 +17,10 @@
   }
 
   & > * {
+    margin-bottom: 12px;
+  }
+
+  h3 {
     margin-bottom: 4px;
   }
 
@@ -35,8 +39,8 @@
   .social {
     display: flex;
     justify-content: center;
-    margin: 0;
     padding: 0;
+    margin-top: 0;
     list-style-type: none;
   }
 
@@ -49,10 +53,18 @@
     background-position: center center;
     background-repeat: no-repeat;
 
-    &.linkedin { background-image: url('/static/icon-linkedin.svg') }
-    &.twitter {background-image: url('/static/icon-twitter.svg') }
-    &.github { background-image: url('/static/icon-github.svg') }
-    &.dribbble { background-image: url('/static/icon-dribbble.svg') }
+    &.linkedin {
+      background-image: url("/static/icon-linkedin.svg");
+    }
+    &.twitter {
+      background-image: url("/static/icon-twitter.svg");
+    }
+    &.github {
+      background-image: url("/static/icon-github.svg");
+    }
+    &.dribbble {
+      background-image: url("/static/icon-dribbble.svg");
+    }
   }
 
   .experience {

components/Team/Team.js

@@ -1,26 +1,27 @@
-import Section from '../Section';
-import Container from '../Container';
-import Intro from '../Intro';
-import Card from './Card';
-import team from '../../data/team.json';
-import styles from './Team.scss';
+import Section from "../Section";
+import Container from "../Container";
+import Intro from "../Intro";
+import Card from "./Card";
+import team from "../../data/team.json";
+import styles from "./Team.scss";
 
 const Team = () => (
   <Section className={styles.team}>
     <Container>
       <a name="team" />
 
-      <Intro>
+      <Intro className={styles.teamHero}>
         <h2>Team</h2>
         <p className={styles.large}>
-          The nOS team consists of experienced developers and researchers with a history in blockchain and smart contract development.
-          With roots in City of Zion, many members of the team have developed on (and for) the NEO Blockchain.
-            {/*{' '}*/}
+          The nOS team consists of experienced developers and researchers with a history in blockchain and smart
+          contract development. With roots in City of Zion, many members of the team have developed on (and for) the NEO
+          Blockchain.
+          {/*{' '}*/}
         </p>
       </Intro>
 
       <div className={styles.cards}>
-        {team.map((member) => (
+        {team.map(member => (
           <Card key={member.name} {...member} />
         ))}
       </div>

components/Team/Team.scss

@@ -12,4 +12,8 @@
     justify-content: space-around;
     flex-wrap: wrap;
   }
-}
+}
+
+.teamHero {
+  margin: 0 auto 64px;
+}

data/team.json

@@ -3,11 +3,7 @@
     "name": "Dean van Dugteren",
     "role": "Founder & CEO",
     "image": "static/team-dean.png",
-    "experience": [
-      "Developer at City of Zion",
-      "Founder VDT.Network",
-      "Founder Click.DJ"
-    ],
+    "experience": ["Developer at City of Zion", "Founder VDT.Network", "Founder Click.DJ"],
     "linkedin": "https://linkedin.com/in/Deanpress",
     "twitter": "https://twitter.com/Deanpress",
     "github": "https://github.com/deanpress"
@@ -16,11 +12,7 @@
     "name": "Jeroen Peeters",
     "role": "Developer / Project Manager",
     "image": "static/team-jeoren.png",
-    "experience": [
-      "Front-end Consultant at Evance",
-      "Contributor at City of Zion",
-      "Creator of Neoblog"
-    ],
+    "experience": ["Front-end Developer at Unified Post", "Contributor at City of Zion", "Creator of Neoblog"],
     "linkedin": "https://linkedin.com/in/jeroenptrs",
     "twitter": "https://twitter.com/_jptrs",
     "github": "https://github.com/jeroenptrs"
@@ -29,27 +21,37 @@
     "name": "Maurice Dalderup",
     "role": "Full-stack Developer",
     "image": "static/team-maurice.png",
-    "experience": [
-      "Blockchain Consultant at Trase",
-      "Contributor at City of Zion",
-      "Creator of Neoblog"
-    ],
+    "experience": ["Blockchain Consultant at Trase", "Contributor at City of Zion", "Creator of Neoblog"],
     "linkedin": "https://linkedin.com/in/mauricedalderup",
     "twitter": "https://twitter.com/mauricedalderup",
     "github": "https://github.com/dalderupmaurice"
   },
   {
     "name": "Fabricio Rosa Marques",
-    "role": "Design Contributor",
+    "role": "UI / UX Designer",
     "image": "static/team-fab.png",
-    "experience": [
-      "Lead Designer at Pitch",
-      "Product Designer at Pie",
-      "Designer at fournova (Tower)"
-    ],
+    "experience": ["Lead Designer at Pitch", "Product Designer at Pie", "Designer at fournova (Tower)"],
     "linkedin": "https://linkedin.com/in/fabriciorm",
+    "twitter": "https://linkedin.com/in/fabric_8",
     "dribbble": "https://dribbble.com/fabric8"
   },
+  {
+    "name": "Nick Nikijuluw",
+    "role": "Enterprise Solutions Advisor",
+    "image": "static/team-nick.png",
+    "experience": ["Managing Director at Data Access Europe"],
+    "linkedin": "https://www.linkedin.com/in/nick-nikijuluw-240956"
+  },
+  {
+    "name": "Roger Lim",
+    "role": "Advisor",
+    "image": "static/team-roger.png",
+    "experience": [
+      "Neo Global Capital Founding Partner",
+      "Advisor to Bluzelle, QLink, Tomocoin, 0Chain, Open Platform."
+    ],
+    "linkedin": "https://linkedin.com/in/limroger"
+  },
   {
     "name": "Nikolaj Kuntner",
     "role": "Research Contributor",
@@ -66,41 +68,16 @@
     "name": "Alexandra Bergmayr",
     "role": "Research Contributor",
     "image": "static/team-alexandra.png",
-    "experience": [
-      "B.Sc. in Technical Mathematics",
-      "B.Sc. in Financial and Actuarial Mathematics"
-    ],
+    "experience": ["B.Sc. in Technical Mathematics", "B.Sc. in Financial and Actuarial Mathematics"],
     "linkedin": "https://www.linkedin.com/in/alexandra-b-639773173/"
   },
   {
     "name": "Matt Huggins",
     "role": "Code Contributor",
     "image": "static/team-matt.png",
-    "experience": [
-      "Developer at City of Zion",
-      "Former maintainer of Neon Wallet"
-    ],
+    "experience": ["Developer at City of Zion", "Former maintainer of Neon Wallet"],
     "linkedin": "https://linkedin.com/in/huggie",
     "twitter": "https://twitter.com/mhuggins",
     "github": "https://github.com/mhuggins"
-  },
-  {
-    "name": "Nick Nikijuluw",
-    "role": "Enterprise Solutions Advisor",
-    "image": "static/team-nick.png",
-    "experience": [
-      "Managing Director at Data Access Europe"
-    ],
-    "linkedin": "https://www.linkedin.com/in/nick-nikijuluw-240956"
-  },
-  {
-    "name": "Roger Lim",
-    "role": "Advisor",
-    "image": "static/team-roger.png",
-    "experience": [
-      "Neo Global Capital Founding Partner",
-      "Advisor to Bluzelle, QLink, Tomocoin, 0Chain, Open Platform."
-    ],
-    "linkedin": "https://linkedin.com/in/limroger"
   }
 ]