From 5684b4745bf00064c60edaa6ec36a2eedf051c4a Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Wed, 13 Nov 2019 16:29:03 +0700 Subject: [PATCH] header plugs is back again --- src/components/main/Header/index.tsx | 13 ++++++++++- src/components/main/Header/style.scss | 23 +++++++++---------- src/components/main/Notifications/styles.scss | 3 +++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/components/main/Header/index.tsx b/src/components/main/Header/index.tsx index 5925d341..ec988bb7 100644 --- a/src/components/main/Header/index.tsx +++ b/src/components/main/Header/index.tsx @@ -15,6 +15,7 @@ import { pick } from 'ramda'; import { UserButton } from '../UserButton'; import { Icon } from '~/components/input/Icon'; import { Notifications } from '../Notifications'; +import { URLS } from '~/constants/urls'; const mapStateToProps = state => ({ user: pick(['username', 'is_user', 'photo'])(selectUser(state)), @@ -42,7 +43,17 @@ const HeaderUnconnected: FC = memo( {is_user && (
- + + FLOW + + + + BORIS + + +
+ +
)} diff --git a/src/components/main/Header/style.scss b/src/components/main/Header/style.scss index 9cc81182..c6df522c 100644 --- a/src/components/main/Header/style.scss +++ b/src/components/main/Header/style.scss @@ -17,18 +17,6 @@ text-transform: uppercase; align-items: center; - &::after { - content: ' '; - margin-left: $spc; - background: white; - width: 4px; - height: $gap; - display: block; - opacity: 0.2; - border-radius: 4px; - margin-right: 10px; - } - & > a.item, & > div.item { font: $font_16_medium; @@ -50,6 +38,17 @@ padding-left: $spc + $gap; } + &::after { + content: ' '; + margin-left: $spc; + background: white; + width: 4px; + height: $gap; + display: block; + opacity: 0.2; + border-radius: 4px; + } + &:last-child { // padding-right: 0; diff --git a/src/components/main/Notifications/styles.scss b/src/components/main/Notifications/styles.scss index a1315f34..6e0ae869 100644 --- a/src/components/main/Notifications/styles.scss +++ b/src/components/main/Notifications/styles.scss @@ -20,6 +20,9 @@ fill: white; position: relative; outline: none; + color: white; + word-wrap: initial; + white-space: initial; &.active { .icon {