mirror of
https://github.com/elyby/accounts-frontend.git
synced 2025-03-04 23:23:40 +05:30
#118: move LangMenu inside FooterMenu
This commit is contained in:
parent
0b1f88107b
commit
61534b069b
@ -3,7 +3,6 @@ import React, { Component, PropTypes } from 'react';
|
|||||||
import { FormattedMessage as Message } from 'react-intl';
|
import { FormattedMessage as Message } from 'react-intl';
|
||||||
|
|
||||||
import { Button } from 'components/ui/form';
|
import { Button } from 'components/ui/form';
|
||||||
import { LangMenu } from 'components/langMenu';
|
|
||||||
import { FooterMenu } from 'components/footerMenu';
|
import { FooterMenu } from 'components/footerMenu';
|
||||||
|
|
||||||
import styles from './appInfo.scss';
|
import styles from './appInfo.scss';
|
||||||
@ -56,9 +55,8 @@ export default class AppInfo extends Component {
|
|||||||
<Button onClick={onGoToAuth} label={messages.goToAuth} />
|
<Button onClick={onGoToAuth} label={messages.goToAuth} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.langMenu}>
|
<div className={styles.footer}>
|
||||||
<FooterMenu skin="light" />
|
<FooterMenu />
|
||||||
<LangMenu />
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.langMenu {
|
.footer {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 10px;
|
bottom: 10px;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
@ -3,6 +3,8 @@ import React, { Component, PropTypes } from 'react';
|
|||||||
import { Link } from 'react-router';
|
import { Link } from 'react-router';
|
||||||
import { FormattedMessage as Message } from 'react-intl';
|
import { FormattedMessage as Message } from 'react-intl';
|
||||||
|
|
||||||
|
import { LangMenu } from 'components/langMenu';
|
||||||
|
|
||||||
import styles from './footerMenu.scss';
|
import styles from './footerMenu.scss';
|
||||||
import messages from './footerMenu.intl.json';
|
import messages from './footerMenu.intl.json';
|
||||||
|
|
||||||
@ -10,7 +12,6 @@ export default class FooterMenu extends Component {
|
|||||||
static displayName = 'FooterMenu';
|
static displayName = 'FooterMenu';
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
skin: PropTypes.oneOf(['light', 'dark']),
|
|
||||||
createPopup: PropTypes.func.isRequired
|
createPopup: PropTypes.func.isRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -24,6 +25,8 @@ export default class FooterMenu extends Component {
|
|||||||
<a href="#" onClick={this.onContact}>
|
<a href="#" onClick={this.onContact}>
|
||||||
<Message {...messages.contactUs} />
|
<Message {...messages.contactUs} />
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
<LangMenu />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
.footerMenu {
|
.footerMenu {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
color: #666;
|
color: #666;
|
||||||
|
|
||||||
a {
|
a {
|
||||||
|
@ -15,9 +15,11 @@
|
|||||||
margin: 0 auto 10px;
|
margin: 0 auto 10px;
|
||||||
|
|
||||||
perspective: 600px;
|
perspective: 600px;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu {
|
.menu {
|
||||||
|
pointer-events: auto;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border: 5px solid #ddd8ce;
|
border: 5px solid #ddd8ce;
|
||||||
border-left: 0;
|
border-left: 0;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
padding: 55px 10px 45px; // 45px for footer
|
padding: 55px 10px 65px; // 65px for footer
|
||||||
}
|
}
|
||||||
|
|
||||||
.footer {
|
.footer {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user