Skip to content

Commit

Permalink
feat(modern auth): fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
milan-bc committed Sep 28, 2020
2 parents aa0a3ac + dca1912 commit 0dea118
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const AddressesColumn = styled.div`
white-space: nowrap;
width: 50%;
${media.atLeastTabletL`
display: flex;
display: flex;
`}
`
const AmountColumn = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { required, validWalletId } from 'services/FormHelper'
import { SuccessCartridge } from 'components/Cartridge'
import { Wrapper } from 'components/Public'
import Bowser from 'bowser'
import media from 'services/ResponsiveService'
import QRCodeWrapper from 'components/QRCodeWrapper'
import React from 'react'
import styled from 'styled-components'
Expand Down Expand Up @@ -53,12 +54,19 @@ const OuterWrapper = styled.div`
display: flex;
flex-direction: row;
width: 1028px;
${media.tabletL`
width: 100%;
justify-content: center;
`};
`
const SideWrapper = styled.div`
width: 274px;
padding: 12px 0 12px 0;
display: flex;
flex-direction: column;
${media.tabletL`
display: none;
`};
`
const CenterWrapper = styled.div`
display: flex;
Expand Down

0 comments on commit 0dea118

Please sign in to comment.