about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSurinna Curtis <ekiru.0@gmail.com>2017-07-02 23:34:14 -0500
committerGô Shoemake <marrus-sh@users.noreply.github.com>2017-07-04 21:33:53 -0700
commit301c185878c30edfeaac40d9e7ebbd23b9acbed3 (patch)
treee7b2af5911da9a6a2aabfb5edf3f4e73fb744956
parentcb7f54891f8a531180fc849a13b9069c138c3bb7 (diff)
highlight … button if any options enabled
-rw-r--r--app/javascript/mastodon/features/compose/components/advanced_options_dropdown.js6
-rw-r--r--app/javascript/styles/components.scss2
2 files changed, 6 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/advanced_options_dropdown.js b/app/javascript/mastodon/features/compose/components/advanced_options_dropdown.js
index da2d37767..129f7803d 100644
--- a/app/javascript/mastodon/features/compose/components/advanced_options_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/advanced_options_dropdown.js
@@ -71,6 +71,8 @@ export default class AdvancedOptionsDropdown extends React.PureComponent {
     const options = [
       { icon: 'wifi', shortText: messages.local_only_short,  longText: messages.local_only_long, key: 'do_not_federate' },
     ];
+
+    const anyEnabled = values.some((enabled) => enabled); 
     const optionElems = options.map((option) => {
       const active = values.get(option.key) ? 'active' : '';
       return (
@@ -86,11 +88,11 @@ export default class AdvancedOptionsDropdown extends React.PureComponent {
       );
     });
 
-    return <div ref={this.setRef} className={`advanced-options-dropdown ${open ? 'active' : ''}`}>
+    return <div ref={this.setRef} className={`advanced-options-dropdown ${open ?  'open' : ''} ${anyEnabled ? 'active' : ''} `}>
       <div className='advanced-options-dropdown__value'>
         <IconButton className='advanced-options-dropdown__value'
           title={intl.formatMessage(messages.advanced_options_icon_title)}
-          icon='ellipsis-h' active={open}
+          icon='ellipsis-h' active={open || anyEnabled}
           size={18} inverted
           style={iconStyle}
           onClick={this.onToggleDropdown} />
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index c9d5a2841..fcab01b01 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2941,7 +2941,9 @@ button.icon-button.active i.fa-retweet {
     border-radius: 4px 4px 0 0;
     box-shadow: 0 -4px 4px rgba($base-shadow-color, 0.1);
   }
+}
 
+.advanced-options-dropdown.open {
   .advanced-options-dropdown__dropdown {
     display: block;
     box-shadow: 2px 4px 6px rgba($base-shadow-color, 0.1);