From 9527d1262e1636262ec7fba8a7f1b29fb9044eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=A7=D0=B8=D0=BA=D0=B0=D0=BB=D0=BA=D0=B8=D0=BD?= Date: Thu, 3 Sep 2020 10:45:03 +0300 Subject: [PATCH] fix layout --- src/client/Containers/Calculation/Results/index.jsx | 2 +- src/client/Containers/Calculation/Sections/index.jsx | 11 +++++++---- src/client/Elements/Background.jsx | 2 +- src/client/hocs/withTitle.jsx | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/client/Containers/Calculation/Results/index.jsx b/src/client/Containers/Calculation/Results/index.jsx index 73747c9..e5d6649 100644 --- a/src/client/Containers/Calculation/Results/index.jsx +++ b/src/client/Containers/Calculation/Results/index.jsx @@ -5,7 +5,7 @@ import Title from 'client/Elements/Title'; import { Flex } from 'client/UIKit/grid'; const Results = props => ( - + </Background> ); diff --git a/src/client/Containers/Calculation/Sections/index.jsx b/src/client/Containers/Calculation/Sections/index.jsx index 8f1a5db..2558e54 100644 --- a/src/client/Containers/Calculation/Sections/index.jsx +++ b/src/client/Containers/Calculation/Sections/index.jsx @@ -11,13 +11,16 @@ const { TabPane } = Tabs; const InputWrapper = styled(Box)` width: 100%; - ${mq.desktop`width:250px`} + ${mq.desktop`flex: 2 0 23%; + width:23%; + `} margin: 8px 8px; - ${props => props.newLine && 'flex-basis: 100%;'} + + // ${(props) => props.newLine && 'flex-basis: 100%;'} `; -const Sections = props => ( - <Background flex="3 1 25rem"> +const Sections = (props) => ( + <Background flex="3 0 72%"> <Tabs type="line"> {SectionsList.map(({ title, elements }, i) => ( <TabPane tab={title} key={i}> diff --git a/src/client/Elements/Background.jsx b/src/client/Elements/Background.jsx index 8f59f5a..38ec280 100644 --- a/src/client/Elements/Background.jsx +++ b/src/client/Elements/Background.jsx @@ -7,7 +7,7 @@ const Background = styled(Flex)` margin: 10px 10px; padding: 10px 18px; box-shadow: 4px 5px 17px -11px rgba(0, 0, 0, 0.75); - flex: ${props => props.flex}; + flex: ${(props) => props.flex}; `; export default Background; diff --git a/src/client/hocs/withTitle.jsx b/src/client/hocs/withTitle.jsx index 1742335..b67a0d4 100644 --- a/src/client/hocs/withTitle.jsx +++ b/src/client/hocs/withTitle.jsx @@ -8,7 +8,7 @@ const Title = styled.h5` font-weight: 600; font-size: 15px; line-height: 1.5; - margin: 0 0 2px 0; + margin: 0 0 3px 0; `; const withTitle = title => Component => props => (