From a9ee9722fca6e35a6dedf3fb7a0e94420a4c08f0 Mon Sep 17 00:00:00 2001 From: theprover97 Date: Sun, 23 Feb 2020 22:09:00 +0530 Subject: [PATCH 1/7] Added Edit-Profile Popup --- src/user/profile/popups/edit-profile.js | 99 +++++++++++++++++++++++ src/user/profile/popups/edit-profile.scss | 53 ++++++++++++ src/user/profile/user-info/user-info.js | 11 ++- 3 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 src/user/profile/popups/edit-profile.js create mode 100644 src/user/profile/popups/edit-profile.scss diff --git a/src/user/profile/popups/edit-profile.js b/src/user/profile/popups/edit-profile.js new file mode 100644 index 00000000..e9f25ccd --- /dev/null +++ b/src/user/profile/popups/edit-profile.js @@ -0,0 +1,99 @@ +import React, {Component} from 'react'; +import {Modal, Button, Row, Col, Form} from 'react-bootstrap'; +import "./edit-profile.scss"; + +export class EditProfile extends Component{ + // eslint-disable-next-line + constructor(props){ + super(props); + } + render(){ + return ( + +
+ + +
Edit Profile
+
PERSONAL INFORMATION
+ + + + + + First Name + + + + Last Name + + + + + + Designation + + + + Location + + + + + About + + +
PROFILES
+ + + GitHub URL + + + + LinkedIn URL + + + + + + Facebook URL + + + + +
+ + +
+
+ + ); + } +} \ No newline at end of file diff --git a/src/user/profile/popups/edit-profile.scss b/src/user/profile/popups/edit-profile.scss new file mode 100644 index 00000000..f0f59fb1 --- /dev/null +++ b/src/user/profile/popups/edit-profile.scss @@ -0,0 +1,53 @@ +.heading{ + margin-top: 20px; +} +.title{ + font-size: 22px; + font-weight: 700; + line-height: 29px; + color: #1A73E8; +} +.about{ + font-weight: 500; + font-size: 10px; + line-height: 14px; + letter-spacing: 0.2em; + color: #90949C; + margin-top:10px; +} +.extra{ + margin-bottom: 20px; + margin-left: -15px; +} +.label{ + font-weight: 600; + font-size: 12px; + color:#000000; + margin-bottom: 3px; +} +.form-input{ +font-family: Inter; +font-style: normal; +font-weight: 300; +font-size: 13px; +line-height: 16px; +} +.form-content{ + margin-top:-2%; + margin-bottom: 20px; + justify-content:space-between; +} +.form-footer{ + margin-top: 0; + Button{ + width:90px; + margin-right: 20px; + margin-bottom: 30px; + border-radius: 100px; + font-weight:600; + } + .savebtn{ + background-color: #1A73E8;; + } + +} diff --git a/src/user/profile/user-info/user-info.js b/src/user/profile/user-info/user-info.js index e38c7500..c0dcf6c2 100644 --- a/src/user/profile/user-info/user-info.js +++ b/src/user/profile/user-info/user-info.js @@ -1,9 +1,13 @@ import React, { Component } from "react"; import "./user-info.scss"; import { Button } from "react-bootstrap"; - +import {EditProfile} from "./../popups/edit-profile"; class UserInfo extends Component { + state = { editProfile:false }; render() { + let cancel =()=>this.setState({ + editProfile:false + }); return (
@@ -11,7 +15,10 @@ class UserInfo extends Component {
- + +
From 2a0c6856b2b4274c02389bd5fd5da77f12cea394 Mon Sep 17 00:00:00 2001 From: theprover97 Date: Mon, 24 Feb 2020 17:16:06 +0530 Subject: [PATCH 2/7] Added Logout Button and Popup --- src/user/dashboard/navigation/navigation.js | 31 +++++++++++++++++-- src/user/profile/popups/edit-profile.scss | 27 +++++++++++++++++ src/user/profile/popups/logout.js | 33 +++++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 src/user/profile/popups/logout.js diff --git a/src/user/dashboard/navigation/navigation.js b/src/user/dashboard/navigation/navigation.js index 54803a52..33ca9bb0 100644 --- a/src/user/dashboard/navigation/navigation.js +++ b/src/user/dashboard/navigation/navigation.js @@ -1,12 +1,17 @@ import React, { Component } from "react"; -import { ListGroup } from "react-bootstrap"; +import { ListGroup, Button } from "react-bootstrap"; import { NavLink } from "react-router-dom"; import "./navigation.scss"; +import {Logout} from "../../profile/popups/logout"; import logo from "../../../svgs/donut.svg"; class Navigation extends Component { + state = { logout:false }; render() { + let cancel =()=>this.setState({ + logout:false + }); const divStyle = { position: "absolute", bottom: 0 @@ -109,7 +114,7 @@ class Navigation extends Component { Account - + Settings + + + +
); diff --git a/src/user/profile/popups/edit-profile.scss b/src/user/profile/popups/edit-profile.scss index f0f59fb1..5a8b072a 100644 --- a/src/user/profile/popups/edit-profile.scss +++ b/src/user/profile/popups/edit-profile.scss @@ -14,6 +14,20 @@ letter-spacing: 0.2em; color: #90949C; margin-top:10px; +} + /** + + Logout + + */ +.message{ + font-weight: 500; + font-size: 14px; + line-height: 14px; + letter-spacing: 0.2em; + color: rgb(28, 30, 34); + margin-top:15px; + margin-bottom: 20px; } .extra{ margin-bottom: 20px; @@ -51,3 +65,16 @@ line-height: 16px; } } +/** + + */ \ No newline at end of file diff --git a/src/user/profile/popups/logout.js b/src/user/profile/popups/logout.js new file mode 100644 index 00000000..7e86a0b4 --- /dev/null +++ b/src/user/profile/popups/logout.js @@ -0,0 +1,33 @@ +import React, {Component} from 'react'; +import {Modal, Button} from 'react-bootstrap'; +import "./edit-profile.scss"; + +export class Logout extends Component{ + // eslint-disable-next-line + constructor(props){ + super(props); + } + render(){ + return ( + +
+ + +
Logout?
+
Are you sure you want to logout of Donut?
+ + + +
+ + +
+
+ + ); + } +} \ No newline at end of file From b3c5c3d1124fa112fbcb51a66f7c84ada5201e40 Mon Sep 17 00:00:00 2001 From: theprover97 Date: Tue, 25 Feb 2020 04:13:09 +0530 Subject: [PATCH 3/7] Changes finalising Logout Button and its Popup --- src/svgs/logout.svg | 60 ++++++++++++++++++ src/user/dashboard/navigation/navigation.js | 22 ++----- src/user/dashboard/navigation/navigation.scss | 16 +++-- src/user/profile/popups/edit-profile.js | 2 +- src/user/profile/popups/logout.js | 2 +- src/user/profile/popups/popups.scss | 62 +++++++++++++++++++ 6 files changed, 140 insertions(+), 24 deletions(-) create mode 100644 src/svgs/logout.svg create mode 100644 src/user/profile/popups/popups.scss diff --git a/src/svgs/logout.svg b/src/svgs/logout.svg new file mode 100644 index 00000000..e0188843 --- /dev/null +++ b/src/svgs/logout.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/user/dashboard/navigation/navigation.js b/src/user/dashboard/navigation/navigation.js index 33ca9bb0..4ac449c0 100644 --- a/src/user/dashboard/navigation/navigation.js +++ b/src/user/dashboard/navigation/navigation.js @@ -1,10 +1,10 @@ import React, { Component } from "react"; import { ListGroup, Button } from "react-bootstrap"; import { NavLink } from "react-router-dom"; +import { DonutTitleSmall } from "../../../donutTitle/donutTitle"; import "./navigation.scss"; import {Logout} from "../../profile/popups/logout"; - -import logo from "../../../svgs/donut.svg"; +import logo from "../../../svgs/logout.svg"; class Navigation extends Component { state = { logout:false }; @@ -21,9 +21,7 @@ class Navigation extends Component {
- - logo - +
this.setState({logout:true})}> - - - + L Logout Date: Tue, 25 Feb 2020 04:21:23 +0530 Subject: [PATCH 4/7] Others --- src/404/notFound.js | 34 ++++++++ src/404/notFound.scss | 101 ++++++++++++++++++++++ src/auth/login/login.js | 4 +- src/auth/login/login.scss | 5 -- src/donutTitle/donutTitle.js | 36 ++++++++ src/donutTitle/donutTitle.scss | 33 +++++++ src/images/donut-logo-text.png | Bin 0 -> 6766 bytes src/router.js | 3 + src/user/profile/popups/edit-profile.scss | 80 ----------------- 9 files changed, 209 insertions(+), 87 deletions(-) create mode 100644 src/404/notFound.js create mode 100644 src/404/notFound.scss create mode 100644 src/donutTitle/donutTitle.js create mode 100644 src/donutTitle/donutTitle.scss create mode 100644 src/images/donut-logo-text.png delete mode 100644 src/user/profile/popups/edit-profile.scss diff --git a/src/404/notFound.js b/src/404/notFound.js new file mode 100644 index 00000000..44372542 --- /dev/null +++ b/src/404/notFound.js @@ -0,0 +1,34 @@ +import React from "react"; +import { Link } from "react-router-dom"; + +import "./notFound.scss"; +import { DonutTitle } from "../donutTitle/donutTitle"; + +import donut from "../images/donut.png"; + +const NotFound = () => { + return ( +
+
+ +
+
+
+ 4 + + donut + + 4 +
+
+

We weren't able to find the address you requested,
the link must be old or broken

+
+
+

Go to Dashboard

+
+
+
+ ) +} + +export default NotFound; \ No newline at end of file diff --git a/src/404/notFound.scss b/src/404/notFound.scss new file mode 100644 index 00000000..15addd0a --- /dev/null +++ b/src/404/notFound.scss @@ -0,0 +1,101 @@ +* { + box-sizing: border-box; + margin: 0; + padding: 0; +} +.not-found-container { + overflow: hidden; + width: 100vw; + height: 100vh; +} + +.header { + margin: 50px 0px 0px 10px; + padding: 0; +} + +.content { + width: 100%; + height: 75vh; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 0px 20px; +} + +.content__title { + display: flex; + align-items: center; + justify-content: center; +} + +.title__donut img { + height: 165px; + padding: 7px 0px; + animation: infiniteRotate 3s infinite none; +} + +@keyframes infiniteRotate { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +.title__text { + font-size: 200px; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; + font-weight: 800; + color: #212121; +} + +.content__message { + margin-top: 5px; + font-family: 'Playfair Display', serif; + font-style: italic; + color: #90949c; + font-size: 30px; + text-align: center; +} + +.content__redirect { + margin-top: 30px; + color: #000; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; + font-size: 22px; + font-weight: 500; +} + +.redirect-link { + color: #007bff; + text-decoration: underline; + ::hover { + color: darken(#007bff, 10%); + } +} + +@media only screen and (max-width: 700px) { + .header { + margin: 40px 0px 0px 15px; + } + + .title__donut img { + height: 130px; + padding: 7px 0px; + } + + .title__text { + font-size: 150px; + } + + .content__message { + font-size: 23px; + } + + .content__redirect { + font-size: 20px; + } +} diff --git a/src/auth/login/login.js b/src/auth/login/login.js index 734f13a2..0bdc6a68 100644 --- a/src/auth/login/login.js +++ b/src/auth/login/login.js @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { Tab, Tabs } from "react-bootstrap"; import LoginForm from "../login-form/login-form"; import SignUpForm from "../signup-form/signup-form"; -import logo from "../../svgs/donut.svg"; +import { DonutTitle }from "../../donutTitle/donutTitle"; import multipleDonuts from "../../images/extra-donuts.png"; // import backGroundDonut from "../../images/background-donut.png"; import "./login.scss"; @@ -13,7 +13,7 @@ class Login extends Component {
- donut logo +

One place for meeting everyone.

diff --git a/src/auth/login/login.scss b/src/auth/login/login.scss index 3696c640..896ffa44 100644 --- a/src/auth/login/login.scss +++ b/src/auth/login/login.scss @@ -6,12 +6,7 @@ flex: 1.8; margin: 140px 0 0 0; .logo { - display: flex; padding-bottom: 20px; - img { - width: 280px; - height: 80px; - } h2 { padding: 34px 10px 0 20px; color: #2d2d2d; diff --git a/src/donutTitle/donutTitle.js b/src/donutTitle/donutTitle.js new file mode 100644 index 00000000..16d0462d --- /dev/null +++ b/src/donutTitle/donutTitle.js @@ -0,0 +1,36 @@ +import React from "react"; + +import "./donutTitle.scss"; + +import logoText from "../images/donut-logo-text.png" +import donut from "../images/donut.png"; + +const rotateDonut = () => { + const donut = document.querySelector('.rotateDonut'); + if (donut.style.animation) { + donut.style.animation = ''; + } else { + donut.style.animation = 'infiniteRotate 2s infinite forwards' + } +}; + +const DonutTitle = () => { + return ( +

+ donut logo + donut logo text +
+ ) +} + +const DonutTitleSmall = () => { + return ( +
+ donut logo + donut logo text +
+ ) +} + + +export { DonutTitle, DonutTitleSmall }; \ No newline at end of file diff --git a/src/donutTitle/donutTitle.scss b/src/donutTitle/donutTitle.scss new file mode 100644 index 00000000..8e1ae868 --- /dev/null +++ b/src/donutTitle/donutTitle.scss @@ -0,0 +1,33 @@ +.main-donut-logo { + padding: 0; +} + +.main-donut-logo img { + height: 70px; + margin-bottom: 0px; +} + +.main-donut-logo-small { + display: flex; +} + +.main-donut-logo-small img { + height: 27px; + margin-bottom: 0px; +} + +@keyframes infiniteRotate { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +@media only screen and (max-width: 700px) { + + .main-donut-logo img { + height: 40px; + } +} \ No newline at end of file diff --git a/src/images/donut-logo-text.png b/src/images/donut-logo-text.png new file mode 100644 index 0000000000000000000000000000000000000000..f841f221bb80c7a2e98d887a109736ee4aa97b51 GIT binary patch literal 6766 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 PPGGytY)LnE9EkouQ7v_k literal 0 HcmV?d00001 diff --git a/src/router.js b/src/router.js index fe2e68fa..88ef019e 100644 --- a/src/router.js +++ b/src/router.js @@ -5,6 +5,8 @@ import Dashboard from "./user/dashboard/dashboard"; import PinnedPosts from "./user/pinned-posts/pinned-posts"; import Profile from "./user/profile/profile"; import Organization from "./user/organization/organization"; +import NotFound from "./404/notFound"; + const Router = () => ( @@ -15,6 +17,7 @@ const Router = () => ( + ); diff --git a/src/user/profile/popups/edit-profile.scss b/src/user/profile/popups/edit-profile.scss deleted file mode 100644 index 5a8b072a..00000000 --- a/src/user/profile/popups/edit-profile.scss +++ /dev/null @@ -1,80 +0,0 @@ -.heading{ - margin-top: 20px; -} -.title{ - font-size: 22px; - font-weight: 700; - line-height: 29px; - color: #1A73E8; -} -.about{ - font-weight: 500; - font-size: 10px; - line-height: 14px; - letter-spacing: 0.2em; - color: #90949C; - margin-top:10px; -} - /** - - Logout - - */ -.message{ - font-weight: 500; - font-size: 14px; - line-height: 14px; - letter-spacing: 0.2em; - color: rgb(28, 30, 34); - margin-top:15px; - margin-bottom: 20px; -} -.extra{ - margin-bottom: 20px; - margin-left: -15px; -} -.label{ - font-weight: 600; - font-size: 12px; - color:#000000; - margin-bottom: 3px; -} -.form-input{ -font-family: Inter; -font-style: normal; -font-weight: 300; -font-size: 13px; -line-height: 16px; -} -.form-content{ - margin-top:-2%; - margin-bottom: 20px; - justify-content:space-between; -} -.form-footer{ - margin-top: 0; - Button{ - width:90px; - margin-right: 20px; - margin-bottom: 30px; - border-radius: 100px; - font-weight:600; - } - .savebtn{ - background-color: #1A73E8;; - } - -} -/** - - */ \ No newline at end of file From aefb03724fe29e01dae1e9f8f56785d5df2cb352 Mon Sep 17 00:00:00 2001 From: theprover97 Date: Tue, 25 Feb 2020 04:25:28 +0530 Subject: [PATCH 5/7] Update navigation.js --- src/user/dashboard/navigation/navigation.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/user/dashboard/navigation/navigation.js b/src/user/dashboard/navigation/navigation.js index c7c00f6b..4ac449c0 100644 --- a/src/user/dashboard/navigation/navigation.js +++ b/src/user/dashboard/navigation/navigation.js @@ -6,7 +6,6 @@ import "./navigation.scss"; import {Logout} from "../../profile/popups/logout"; import logo from "../../../svgs/logout.svg"; - class Navigation extends Component { state = { logout:false }; render() { From d7ca17f2dac1019aff8dffe4c56aab278700bd87 Mon Sep 17 00:00:00 2001 From: theprover97 Date: Wed, 26 Feb 2020 16:57:19 +0530 Subject: [PATCH 6/7] Added Followers Popup --- src/user/profile/popups/followers.js | 65 +++++++++++++++++++++++++ src/user/profile/popups/popups.scss | 43 +++++++++++++++- src/user/profile/user-info/user-info.js | 11 ++++- 3 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 src/user/profile/popups/followers.js diff --git a/src/user/profile/popups/followers.js b/src/user/profile/popups/followers.js new file mode 100644 index 00000000..9fa053e4 --- /dev/null +++ b/src/user/profile/popups/followers.js @@ -0,0 +1,65 @@ +import React, {Component} from 'react'; +import {Modal, Button, Row} from 'react-bootstrap'; +import logo from "../../../svgs/profile-icon.svg"; +import "./popups.scss"; + +export class Followers extends Component{ + // eslint-disable-next-line + constructor(props){ + super(props); + } + state = {text:"Follow"}; + render(){ + + return ( + +
+ + +
Followers
+
PEOPLE WHO FOLLOW YOU
+ + + + + I +
+

Dhanus Rajendra

+

Front-End Developer

+
+ + + + I +
+

Dhanus Rajendra

+

Front-End Developer

+
+ + + + I +
+

Dhanus Rajendra

+

Front-End Developer

+
+ + + + I +
+

Dhanus Rajendra

+

Front-End Developer

+
+ + + +
+ + ); + } +} diff --git a/src/user/profile/popups/popups.scss b/src/user/profile/popups/popups.scss index b0d49dc9..52895845 100644 --- a/src/user/profile/popups/popups.scss +++ b/src/user/profile/popups/popups.scss @@ -56,7 +56,48 @@ line-height: 16px; font-weight:600; } .savebtn{ - background-color: #1A73E8;; + background-color: #1A73E8; } +} +.contain{ + margin-top: -3px; +} +.photo{ + margin-top: 3px; + height: 43px; + width: 43px; + } +.user{ + margin-top: 2px; + font-size: 1.1em; + color: black; + margin-left: -145px; +} +.descr{ + font-size: 0.8em; + color: rgb(90, 84, 84); + margin-top: -13px; + margin-left: -137px; +} +.follow-link{ + margin-top: 3px; + padding: 8px; + font-size: 14px; + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 20px; + width: 80px; + height: 35px; + font-family: Inter; + font-style: normal; + font-weight: 600; + font-size: 14px; + line-height: 17px; + text-align: center; +} +.follower{ + margin-top: 10px; + margin-bottom: 10px; + justify-content:space-between; +} \ No newline at end of file diff --git a/src/user/profile/user-info/user-info.js b/src/user/profile/user-info/user-info.js index c0dcf6c2..ba9a2619 100644 --- a/src/user/profile/user-info/user-info.js +++ b/src/user/profile/user-info/user-info.js @@ -2,12 +2,16 @@ import React, { Component } from "react"; import "./user-info.scss"; import { Button } from "react-bootstrap"; import {EditProfile} from "./../popups/edit-profile"; +import {Followers} from "./../popups/followers" class UserInfo extends Component { - state = { editProfile:false }; + state = { editProfile:false, followersList:false }; render() { let cancel =()=>this.setState({ editProfile:false }); + let cancelf =()=>this.setState({ + followersList:false + }); return (
@@ -23,7 +27,10 @@ class UserInfo extends Component {

- Dhanus Rajendra + Dhanus Rajendra +

Front end developer

Bengaluru, Karnataka

From d324abf2ac71a0576c94d9b77f709d00835659c4 Mon Sep 17 00:00:00 2001 From: theprover97 Date: Sat, 29 Feb 2020 12:18:05 +0530 Subject: [PATCH 7/7] Changes in Followers popup --- src/user/profile/popups/followers.js | 56 ++++++++++++++++++---------- src/user/profile/popups/popups.scss | 41 ++++++++++---------- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/src/user/profile/popups/followers.js b/src/user/profile/popups/followers.js index 9fa053e4..c673d738 100644 --- a/src/user/profile/popups/followers.js +++ b/src/user/profile/popups/followers.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import {Modal, Button, Row} from 'react-bootstrap'; +import {Modal, Button, Row, Col} from 'react-bootstrap'; import logo from "../../../svgs/profile-icon.svg"; import "./popups.scss"; @@ -26,36 +26,52 @@ export class Followers extends Component{ - I -
+ I +

Dhanus Rajendra

Front-End Developer

-
- +
+ - - I -
+ + I +
+

Dhanus Rajendra

+

Front-End Developer

+
+ + + + I +

Dhanus Rajendra

Front-End Developer

-
- +
+ - - I -
+ + I +

Dhanus Rajendra

Front-End Developer

-
- +
+ - - I -
+ + I +
+

Dhanus Rajendra

+

Front-End Developer

+
+ + + + I +

Dhanus Rajendra

Front-End Developer

-
- +
+
diff --git a/src/user/profile/popups/popups.scss b/src/user/profile/popups/popups.scss index 52895845..8e8f8f3c 100644 --- a/src/user/profile/popups/popups.scss +++ b/src/user/profile/popups/popups.scss @@ -35,11 +35,11 @@ margin-bottom: 3px; } .form-input{ -font-family: Inter; -font-style: normal; -font-weight: 300; -font-size: 13px; -line-height: 16px; + font-family: Inter; + font-style: normal; + font-weight: 300; + font-size: 13px; + line-height: 16px; } .form-content{ margin-top:-2%; @@ -66,35 +66,32 @@ line-height: 16px; .photo{ margin-top: 3px; height: 43px; - width: 43px; - + width: 43px; } .user{ margin-top: 2px; font-size: 1.1em; - color: black; - margin-left: -145px; + color: black; } .descr{ font-size: 0.8em; color: rgb(90, 84, 84); - margin-top: -13px; - margin-left: -137px; + margin-top: -13px; } .follow-link{ margin-top: 3px; padding: 8px; - font-size: 14px; - box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); - border-radius: 20px; - width: 80px; - height: 35px; - font-family: Inter; - font-style: normal; - font-weight: 600; - font-size: 14px; - line-height: 17px; - text-align: center; + font-size: 14px; + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1); + border-radius: 20px; + width: 80px; + height: 35px; + font-family: Inter; + font-style: normal; + font-weight: 600; + font-size: 14px; + line-height: 17px; + text-align: center; } .follower{ margin-top: 10px;