about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-03-26 13:30:57 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-03-26 13:30:57 +0200
commitc334541011f8c771418c67186e7baeca32b91731 (patch)
tree2265a75e4074d5bad6c2efadaac864c92d772220
parentf864fee1165bb7fa8debc214c11d2edacac01160 (diff)
Add tooltip to privacy dropdown
-rw-r--r--app/assets/javascripts/components/features/compose/components/privacy_dropdown.jsx5
-rw-r--r--app/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
index 7bbf5aef2..e54fa4d28 100644
--- 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
index 707d688db..45f93ef90 100644
--- 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;