scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-09 00:13:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #808 from mlorb/ml-sci-1631

Browse source 
Fix rounded style of buttons and fix invite users to a team style errors [SCI-1631]
This commit is contained in:
mlorb 2017-10-04 14:57:45 +02:00 committed by GitHub
commit fcea55c2a1
2 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/javascript/src/components/InviteUsersModal/index.jsx
View file

@ -55,7 +55,7 @@ class InviteUsersModal extends Component {
team_id: this.props.team.id team_id: this.props.team.id
}) })
.then(({ data }) => { .then(({ data }) => {
this.setState({ inviteResults: data, showInviteUsersResults: true}); this.setState({ inviteResults: data, showInviteUsersResults: true });
}) })
.catch(error => { .catch(error => {
console.log("Invite As Error: ", error); console.log("Invite As Error: ", error);
@ -89,17 +89,23 @@ class InviteUsersModal extends Component {
<Modal.Title> <Modal.Title>
<FormattedMessage <FormattedMessage
id="invite_users.modal_title" id="invite_users.modal_title"
values={{ team: this.props.team.name }} values={{
team: this.props.team.name
}}
/> />
</Modal.Title> </Modal.Title>
</Modal.Header> </Modal.Header>
<Modal.Body>{modalBody}</Modal.Body> <Modal.Body>{modalBody}</Modal.Body>
<Modal.Footer> <Modal.Footer>
<StyledButtonToolbar> <StyledButtonToolbar>
<Button onClick={this.handleCloseModal}>
<FormattedMessage id="general.cancel" />
</Button>
{inviteButton} {inviteButton}
<Button onClick={this.handleCloseModal}>
<FormattedMessage
id={`general.${this.state.showInviteUsersResults
? "close"
: "cancel"}`}
/>
</Button>
</StyledButtonToolbar> </StyledButtonToolbar>
</Modal.Footer> </Modal.Footer>
</Modal> </Modal>
@ -110,10 +116,7 @@ class InviteUsersModal extends Component {
InviteUsersModal.propTypes = { InviteUsersModal.propTypes = {
showModal: bool.isRequired, showModal: bool.isRequired,
onCloseModal: func.isRequired, onCloseModal: func.isRequired,
team: shape({ team: shape({ id: number.isRequired, name: string.isRequired }).isRequired,
id: number.isRequired,
name: string.isRequired
}).isRequired,
updateUsersCallback: func.isRequired updateUsersCallback: func.isRequired
}; };

24
app/javascript/src/styles/main.scss
View file

@ -15,6 +15,10 @@ body {
background-color: $color-theme-primary; background-color: $color-theme-primary;
} }
.btn {
border-radius: 1.5em;
}
.btn-primary { .btn-primary {
background-color: $color-theme-secondary; background-color: $color-theme-secondary;
border-color: $primary-hover-color; border-color: $primary-hover-color;
@ -31,3 +35,23 @@ body {
position: relative !important; position: relative !important;
} }
} }
// tags input
.react-tagsinput--focused {
border-color: $color-theme-primary;
}
.react-tagsinput-input {
width: 100%;
}
.react-tagsinput-tag {
background-color: $color-theme-primary;
border: 0;
color: $color-white;
font-weight: bold;
}
.react-tagsinput-remove {
color: $color-white;
}