From 08afff0e89736935b54e9c912ded68d8cca016bc Mon Sep 17 00:00:00 2001 From: Chika Date: Wed, 2 Sep 2020 21:47:31 +0300 Subject: [PATCH] UI fixes --- src/client/App.tsx | 34 +++++++++++-------- .../Containers/Calculation/Sections/index.jsx | 7 ++-- src/client/Elements/Title.jsx | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/client/App.tsx b/src/client/App.tsx index bf24078..6e0dcd3 100644 --- a/src/client/App.tsx +++ b/src/client/App.tsx @@ -1,22 +1,26 @@ -import "mobx-react/batchingForReactDom"; -import { StoreProvider } from "client/contexts/storeContext"; -import theme from "client/UIKit/theme"; -import React from "react"; -import { BrowserRouter } from "react-router-dom"; -import { ThemeProvider } from "styled-components"; -import "./App.css"; -import Layout from "./Layout"; +import 'mobx-react/batchingForReactDom'; +import { StoreProvider } from 'client/contexts/storeContext'; +import theme from 'client/UIKit/theme'; +import React from 'react'; +import { BrowserRouter } from 'react-router-dom'; +import { ThemeProvider } from 'styled-components'; +import './App.css'; +import Layout from './Layout'; +import { ConfigProvider } from 'antd'; +import ruRu from 'antd/es/locale/ru_RU'; function App() { return (
- - - - - - - + + + + + + + + +
); } diff --git a/src/client/Containers/Calculation/Sections/index.jsx b/src/client/Containers/Calculation/Sections/index.jsx index 90fc3fd..6d8ce7e 100644 --- a/src/client/Containers/Calculation/Sections/index.jsx +++ b/src/client/Containers/Calculation/Sections/index.jsx @@ -4,6 +4,7 @@ import { Box, Flex } from 'client/UIKit/grid'; import React from 'react'; import styled from 'styled-components'; import SectionsList from './list'; +import withTitle from 'client/hocs/withTitle'; const { TabPane } = Tabs; @@ -17,11 +18,11 @@ const Sections = props => ( {SectionsList.map(({ title, elements }, i) => ( - - {elements.map(({ Component, props }, ie) => { + + {elements.map(({ title, Component, props }, ie) => { return ( - + {withTitle(title)(Component)(props)} ); })} diff --git a/src/client/Elements/Title.jsx b/src/client/Elements/Title.jsx index b9f2216..d76b080 100644 --- a/src/client/Elements/Title.jsx +++ b/src/client/Elements/Title.jsx @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; const TitleText = styled.div` - font-size: 1.3rem; + font-size: 1.25rem; font-weight: 500; `;