Skip to content
Snippets Groups Projects
Commit d0a5b7ce authored by Anton Georgiev's avatar Anton Georgiev Committed by GitHub
Browse files

Merge pull request #3360 from JaeeunCho/dropdown_chg

HTML5 Dropdown - fixed warnings and added style
parents 06b77169 9b594e8a
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ class LeaveConfirmation extends Component { ...@@ -47,7 +47,7 @@ class LeaveConfirmation extends Component {
<Modal <Modal
title={intl.formatMessage(intlMessages.title)} title={intl.formatMessage(intlMessages.title)}
confirm={{ confirm={{
callback: this.handleLeave, callback: this.handleLeaveConfirmation,
label: intl.formatMessage(intlMessages.confirmLabel), label: intl.formatMessage(intlMessages.confirmLabel),
description: intl.formatMessage(intlMessages.confirmDesc), description: intl.formatMessage(intlMessages.confirmDesc),
}} }}
......
...@@ -2,7 +2,7 @@ import React, { Component, PropTyes } from 'react'; ...@@ -2,7 +2,7 @@ import React, { Component, PropTyes } from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import classNames from 'classnames'; import classNames from 'classnames';
import styles from './styles'; import styles from '../styles';
import { showModal } from '/imports/ui/components/app/service'; import { showModal } from '/imports/ui/components/app/service';
import LogoutConfirmation from '/imports/ui/components/logout-confirmation/component'; import LogoutConfirmation from '/imports/ui/components/logout-confirmation/component';
...@@ -63,6 +63,7 @@ export default class SettingsDropdown extends Component { ...@@ -63,6 +63,7 @@ export default class SettingsDropdown extends Component {
ghost={true} ghost={true}
circle={true} circle={true}
hideLabel={true} hideLabel={true}
className={styles.settingBtn}
// FIXME: Without onClick react proptypes keep warning // FIXME: Without onClick react proptypes keep warning
// even after the DropdownTrigger inject an onClick handler // even after the DropdownTrigger inject an onClick handler
......
@import "../../../stylesheets/variables/_all";
...@@ -60,3 +60,11 @@ ...@@ -60,3 +60,11 @@
height:1px; height:1px;
overflow:hidden; overflow:hidden;
} }
.settingBtn {
transform: rotate(90deg);
span {
border: none;
box-shadow: none;
}
}
...@@ -77,7 +77,7 @@ class Auth { ...@@ -77,7 +77,7 @@ class Auth {
let logoutURL = this.logoutURL; let logoutURL = this.logoutURL;
callServer('userLogout'); callServer('userLogout');
clearCredentials(() => { this.clearCredentials(() => {
document.location.href = logoutURL; document.location.href = logoutURL;
}); });
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment