logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c334541011f8c771418c67186e7baeca32b91731
parent: f864fee1165bb7fa8debc214c11d2edacac01160
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun, 26 Mar 2017 13:30:57 +0200

Add tooltip to privacy dropdown

Diffstat:

Mapp/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx5+++--
Mapp/assets/stylesheets/components.scss2+-
2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx b/app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx @@ -10,7 +10,8 @@ const messages = defineMessages({ private_short: { id: 'privacy.private.short', defaultMessage: 'Private' }, private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' }, direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' }, - direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' } + direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' }, + change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' } }); const iconStyle = { @@ -79,7 +80,7 @@ const PrivacyDropdown = React.createClass({ return ( <div ref={this.setRef} className={`privacy-dropdown ${open ? 'active' : ''}`}> - <div className='privacy-dropdown__value'><IconButton icon={valueOption.icon} size={18} active={open} inverted onClick={this.handleToggle} style={iconStyle} /></div> + <div className='privacy-dropdown__value'><IconButton icon={valueOption.icon} title={intl.formatMessage(messages.change_privacy)} size={18} active={open} inverted onClick={this.handleToggle} style={iconStyle} /></div> <div className='privacy-dropdown__dropdown'> {options.map(item => <div key={item.value} onClick={this.handleClick.bind(this, item.value)} className={`privacy-dropdown__option ${item.value === value ? 'active' : ''}`}> diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss @@ -1660,7 +1660,7 @@ button.active i.fa-retweet { display: none; position: absolute; left: 0; - top: 24px; + top: 27px; width: 230px; background: $color5; border-radius: 0 4px 4px 4px;