diff --git a/app/javascript/images/friends-cropped.png b/app/javascript/images/friends-cropped.png index b13e16a58..3e3f8f952 100755 Binary files a/app/javascript/images/friends-cropped.png and b/app/javascript/images/friends-cropped.png differ diff --git a/app/javascript/images/logos/m_logo_dark.png b/app/javascript/images/logos/m_logo_dark.png new file mode 100644 index 000000000..4fc782aa3 Binary files /dev/null and b/app/javascript/images/logos/m_logo_dark.png differ diff --git a/app/javascript/images/logos/m_logo_light.PNG b/app/javascript/images/logos/m_logo_light.PNG new file mode 100644 index 000000000..49c5ca116 Binary files /dev/null and b/app/javascript/images/logos/m_logo_light.PNG differ diff --git a/app/javascript/images/rabbit_ui_conversation.png b/app/javascript/images/rabbit_ui_conversation.png new file mode 100644 index 000000000..3b8f8d1ea Binary files /dev/null and b/app/javascript/images/rabbit_ui_conversation.png differ diff --git a/app/javascript/images/theme/bg_dark.png b/app/javascript/images/theme/bg_dark.png new file mode 100644 index 000000000..eac5600cd Binary files /dev/null and b/app/javascript/images/theme/bg_dark.png differ diff --git a/app/javascript/images/theme/bg_light.png b/app/javascript/images/theme/bg_light.png new file mode 100644 index 000000000..7a53a2361 Binary files /dev/null and b/app/javascript/images/theme/bg_light.png differ diff --git a/app/javascript/images/theme/m_logo_dark.png b/app/javascript/images/theme/m_logo_dark.png new file mode 100644 index 000000000..905dceffa Binary files /dev/null and b/app/javascript/images/theme/m_logo_dark.png differ diff --git a/app/javascript/images/theme/m_logo_light.png b/app/javascript/images/theme/m_logo_light.png new file mode 100644 index 000000000..9f7b45a6c Binary files /dev/null and b/app/javascript/images/theme/m_logo_light.png differ diff --git a/app/javascript/images/theme/wordmark_dark.png b/app/javascript/images/theme/wordmark_dark.png new file mode 100644 index 000000000..54be41507 Binary files /dev/null and b/app/javascript/images/theme/wordmark_dark.png differ diff --git a/app/javascript/images/theme/wordmark_light.png b/app/javascript/images/theme/wordmark_light.png new file mode 100644 index 000000000..be501421f Binary files /dev/null and b/app/javascript/images/theme/wordmark_light.png differ diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx index fd66310e8..afb89dd60 100644 --- a/app/javascript/mastodon/components/dropdown_menu.jsx +++ b/app/javascript/mastodon/components/dropdown_menu.jsx @@ -193,12 +193,13 @@ export default class Dropdown extends PureComponent { id: id++, }; - handleClick = ({ type }) => { + handleClick = (e) => { if (this.state.id === this.props.openDropdownId) { this.handleClose(); } else { - this.props.onOpen(this.state.id, this.handleItemClick, type !== 'click'); + this.props.onOpen(this.state.id, this.handleItemClick, e.type !== 'click'); } + e.stopPropagation(); }; handleClose = () => { diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx index 4304f9acd..654a16bae 100644 --- a/app/javascript/mastodon/components/poll.jsx +++ b/app/javascript/mastodon/components/poll.jsx @@ -112,9 +112,15 @@ class Poll extends ImmutablePureComponent { e.stopPropagation(); e.preventDefault(); } + }; - handleVote = () => { + handleStopProp = (e) =>{ + e.stopPropagation(); + } + + handleVote = (e) => { + e.stopPropagation(); if (this.props.disabled) { return; } @@ -122,15 +128,17 @@ class Poll extends ImmutablePureComponent { this.props.onVote(Object.keys(this.state.selected)); }; - handleRefresh = () => { + handleRefresh = (e) => { + e.stopPropagation(); if (this.props.disabled) { return; } - this.props.refresh(); + this.props.refresh(e); }; - handleReveal = () => { + handleReveal = (e) => { + e.stopPropagation(); this.setState({ revealed: true }); } @@ -228,8 +236,8 @@ class Poll extends ImmutablePureComponent { } return ( -
-