diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-10 23:21:24 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-10 23:21:24 +0100 |
| commit | 82fd74d101838396fc6462d15106624294b78868 (patch) | |
| tree | 5bf5e71ada5c377090c6a7104b25b37067f1155d /app/assets/javascripts/components/features | |
| parent | 0320ea4b85adab1d5a84613df42120aebe224fab (diff) | |
Fix modals sizing and add animation to it, fix #140 by only making the text of
status clickable (this also fixes multiple dropdown being openable at the same time)
Diffstat (limited to 'app/assets/javascripts/components/features')
3 files changed, 8 insertions, 9 deletions
diff --git a/app/assets/javascripts/components/features/account/components/header.jsx b/app/assets/javascripts/components/features/account/components/header.jsx index 39666bdc1..062f4a0f2 100644 --- a/app/assets/javascripts/components/features/account/components/header.jsx +++ b/app/assets/javascripts/components/features/account/components/header.jsx @@ -28,7 +28,7 @@ const Header = React.createClass({ return ( <div style={{ flex: '0 0 auto', background: '#2f3441', textAlign: 'center', backgroundImage: `url(${account.get('header')})`, backgroundSize: 'cover', position: 'relative' }}> - <div style={{ background: 'rgba(47, 52, 65, 0.8)', padding: '20px 10px' }}> + <div style={{ background: 'rgba(47, 52, 65, 0.9)', padding: '20px 10px' }}> <a href={account.get('url')} target='_blank' rel='noopener' style={{ display: 'block', color: 'inherit', textDecoration: 'none' }}> <div style={{ width: '90px', margin: '0 auto', marginBottom: '10px' }}> <img src={account.get('avatar')} alt='' style={{ display: 'block', width: '90px', height: '90px', borderRadius: '90px' }} /> diff --git a/app/assets/javascripts/components/features/status/components/action_bar.jsx b/app/assets/javascripts/components/features/status/components/action_bar.jsx index 2733cea07..b1202ad8e 100644 --- a/app/assets/javascripts/components/features/status/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/status/components/action_bar.jsx @@ -18,23 +18,23 @@ const ActionBar = React.createClass({ mixins: [PureRenderMixin], handleReplyClick () { - this.props.onReply(status); + this.props.onReply(this.props.status); }, handleReblogClick () { - this.props.onReblog(status); + this.props.onReblog(this.props.status); }, handleFavouriteClick () { - this.props.onFavourite(status); + this.props.onFavourite(this.props.status); }, handleDeleteClick () { - this.props.onDelete(status); + this.props.onDelete(this.props.status); }, handleMentionClick () { - this.props.onMention(status.get('account')); + this.props.onMention(this.props.status.get('account')); }, render () { diff --git a/app/assets/javascripts/components/features/ui/containers/modal_container.jsx b/app/assets/javascripts/components/features/ui/containers/modal_container.jsx index b6c022736..cd7d63a4a 100644 --- a/app/assets/javascripts/components/features/ui/containers/modal_container.jsx +++ b/app/assets/javascripts/components/features/ui/containers/modal_container.jsx @@ -19,9 +19,8 @@ const mapDispatchToProps = dispatch => ({ const imageStyle = { display: 'block', - maxWidth: '100%', - height: 'auto', - margin: '0 auto' + maxWidth: '80vw', + maxHeight: '80vh' }; const Modal = React.createClass({ |