y0rune/frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Maciek Głowacki
2020-11-24 19:01:20 +01:00
parent 3ab2674cb3
commit 44a01cec69
6 changed files with 15035 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/App.tsx
View File

@ -8,16 +8,10 @@ import styled from 'styled-components';
const Wrapper = styled.div`
display: flex;
height: calc(100vh - 80px);
<<<<<<< HEAD
background-color: #eceef4;
padding-top: 20px;
padding-bottom: 20px;
=======
background-color: #ECEEF4;
padding-top:20px;
padding-bottom:20px;
padding-right:20px;
>>>>>>> b687b3c014cabbedb9233d5f33e42d461a04a047
padding-right: 20px;
`;
export const App = () => {