Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/ainura.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/ihor.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/kateryna.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/olha.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/roman.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 18 additions & 13 deletions src/components/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ import React from 'react';
import Title from './common/Title';

import '../styles/AboutUs.styl';
import RomanImage from '../assets/roman.jpg';
import IhorImage from '../assets/ihor.jpg';
import OlhaImage from '../assets/olha.jpg';
import AinuraImage from '../assets/ainura.jpg';
import KaterynaImage from '../assets/kateryna.jpg';

const About = () => (
[
Expand Down Expand Up @@ -50,38 +55,38 @@ const About = () => (
</p>
<ul className="about-us-team-list">
<li className="about-us-team-item">
<img src="http://lorempixel.com/g/100/100/" alt="Ainura Aliieva" />
<img src={KaterynaImage} alt="Kateryna Zharikova" />
<div>
<span className="about-us-team-member">Ainura Aliieva</span>
<p className="about-us-paragraph small">Front-end developer</p>
<span className="about-us-team-member">Kateryna Zharikova</span>
<p className="about-us-paragraph small">Visual Designer</p>
</div>
</li>
<li className="about-us-team-item">
<img src="http://lorempixel.com/g/100/100/" alt="Ihor Kalnytskyi" />
<img src={IhorImage} alt="Ihor Kalnytskyi" />
<div>
<span className="about-us-team-member">Ihor Kalnytskyi</span>
<p className="about-us-paragraph small">Back-end developer</p>
</div>
</li>
<li className="about-us-team-item">
<img src="http://lorempixel.com/g/100/100/" alt="Olha Kurkaiedova" />
<img src={RomanImage} alt="Roman Podoliaka" />
<div>
<span className="about-us-team-member">Olha Kurkaiedova</span>
<p className="about-us-paragraph small">Front-end developer</p>
<span className="about-us-team-member">Roman Podoliaka</span>
<p className="about-us-paragraph small">Back-end developer</p>
</div>
</li>
<li className="about-us-team-item">
<img src="http://lorempixel.com/g/100/100/" alt="Roman Podoliaka" />
<img src={OlhaImage} alt="Olha Kurkaiedova" />
<div>
<span className="about-us-team-member">Roman Podoliaka</span>
<p className="about-us-paragraph small">Back-end developer</p>
<span className="about-us-team-member">Olha Kurkaiedova</span>
<p className="about-us-paragraph small">Front-end developer</p>
</div>
</li>
<li className="about-us-team-item">
<img src="http://lorempixel.com/g/100/100/" alt="Kateryna Zharikova" />
<img src={AinuraImage} alt="Ainura Aliieva" />
<div>
<span className="about-us-team-member">Kateryna Zharikova</span>
<p className="about-us-paragraph small">Visual Designer</p>
<span className="about-us-team-member">Ainura Aliieva</span>
<p className="about-us-paragraph small">Front-end developer</p>
</div>
</li>
</ul>
Expand Down
3 changes: 3 additions & 0 deletions src/styles/AboutUs.styl
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
padding-bottom: 0
& img
border-radius: 50%
width: 100px
height: 100px
background-color: about-us-image-backup
& + div
padding-left: 20px
padding-top: 15px
Expand Down
1 change: 1 addition & 0 deletions src/styles/common/variables.styl
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ about-us-paragraph = color-dim-gray-grey-s0
about-us-title = color-night-rider-grey-s0
about-us-point = color-shamrock-green-s73
about-us-border = color-shamrock-green-s73
about-us-image-backup = color-shady-lady-gray-s0
offset = 70px

font-raleway = 'Raleway', sans-serif
Expand Down