Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

verison 1.6.2 #138

Merged
merged 1 commit into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arbor-frontend",
"version": "1.6.1",
"version": "1.6.2",
"private": true,
"dependencies": {
"@brainhubeu/react-carousel": "1.19.26",
Expand Down
5 changes: 3 additions & 2 deletions src/components/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ const DialogContent = withStyles({
root: {
'&:first-child': {
paddingTop: '80px'
}
},
maxWidth: '800px'
}
})(MuiDialogContent);

const styles = makeStyles({
dialogContainer: {
'& > .MuiDialog-paper > .MuiDialogContent-root:first-child': {
paddingTop: '80px'
}
},
},
dialogContentWrapper: {
position: 'relative',
Expand Down
2 changes: 1 addition & 1 deletion src/components/VcProofsWizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import SaveButton from './buttons/Save';

const useStyles = makeStyles({
root: {

maxWidth: '700px'
},
info: {
fontFamily: 'Inter',
Expand Down
2 changes: 1 addition & 1 deletion src/components/icons/IconTelegram.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ export default props => (
<SvgIcon
{...props}
>
<path d="M9.83648 14.5584L18.4871 7.71097L7.26049 13.3689L2.71205 12.0154C1.73182 11.7285 1.72482 11.0851 2.93388 10.6219L20.65 4.1052C21.4584 3.75635 22.2398 4.29107 21.931 5.47202L18.9144 19.0334C18.7036 19.998 18.095 20.2268 17.2477 19.7817L12.6523 16.5438C11.9188 17.2242 10.6736 19.0315 9.52273 19.0315L9.83648 14.5584ZM9.83648 14.5584H9.83448" stroke="#42424F" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
<path d="M9.83648 14.5584L18.4871 7.71097L7.26049 13.3689L2.71205 12.0154C1.73182 11.7285 1.72482 11.0851 2.93388 10.6219L20.65 4.1052C21.4584 3.75635 22.2398 4.29107 21.931 5.47202L18.9144 19.0334C18.7036 19.998 18.095 20.2268 17.2477 19.7817L12.6523 16.5438C11.9188 17.2242 10.6736 19.0315 9.52273 19.0315L9.83648 14.5584ZM9.83648 14.5584H9.83448" stroke="#42424F" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" fill="none"/>
</SvgIcon>
);
2 changes: 1 addition & 1 deletion src/routes/Organization/Components/Payments.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const styles = makeStyles({
fontWeight: 400,
fontSize: '14px',
color: colors.greyScale.dark,
padding: '40px 0'
margin: '0 0 40px 0'
},
servicesTitleWrapper: {
fontSize: '24px',
Expand Down
3 changes: 2 additions & 1 deletion src/routes/Organization/Components/Services.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ const styles = makeStyles({
position: 'relative',
fontWeight: 400,
fontSize: '14px',
color: colors.greyScale.dark
color: colors.greyScale.dark,
margin: '0 0 40px 0'
},
servicesTitleWrapper: {
fontSize: '24px',
Expand Down
4 changes: 2 additions & 2 deletions src/routes/Organization/Components/SimardAccounts.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ const styles = makeStyles({
marginTop: '10px'
},
content: {
marginBottom: '60px'
marginBottom: '40px'
},
header: {
position: 'relative',
fontWeight: 400,
fontSize: '14px',
color: colors.greyScale.dark,
padding: '40px 0 0 0'
padding: '0 0 0 0'
},
headerTitle: {
fontSize: '24px',
Expand Down
19 changes: 10 additions & 9 deletions src/routes/Organization/Organization.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,28 @@ const styles = makeStyles({
fontWeight: 500,
lineHeight: 1.14,
color: '#42424F',
margin: '0 0 20px 0'
margin: '0 0 40px 0'
},
topSectionText: {
color: '#5E666A',
marginBottom: '19px',
marginBottom: '40px',
lineHeight: '28px'
},
topDiv: {
lifDepBlock: {
backgroundColor: colors.greyScale.moreLighter,
marginBottom: '19px',
margin: '0 0 40px 0',
padding: '60px 0 60px 0'
},
mainTitle: {
fontSize: '40px',
fontWeight: 500,
lineHeight: 1.14,
color: colors.greyScale.darkest,
margin: '107px 0 25px 0'
margin: '107px 0 40px 0'
},
topText: {
color: colors.greyScale.dark,
marginBottom: '19px',
marginBottom: '40px',
lineHeight: '28px'
},

Expand All @@ -107,7 +108,7 @@ const styles = makeStyles({
color: colors.primary.white,
textTransform: 'none',
padding: '4px 14px'
},
}
});

export function Organization (props) {
Expand Down Expand Up @@ -186,7 +187,7 @@ export function Organization (props) {
/>
<Info organization={organization} canManage={canManage} orgIdLifDepositAmount={orgIdLifDepositAmount}/>
{subsidiaries && subsidiaries.length > 0 &&
<div style={{ marginBottom: '30px' }}>
<div style={{ marginBottom: '40px' }}>
<SubOrganizations organization={organization} subs={subs} canManage={canManage} />
</div>
}
Expand All @@ -199,7 +200,7 @@ export function Organization (props) {
organization={organization}
/>
{showLifDepositSection &&
<div className={classes.topDiv}>
<div className={`${classes.lifDepBlock} ${classes.bm80}`}>
<Container>
<Grid container>
<Grid item xs={12} lg={6}>
Expand Down