Skip to content

Commit

Permalink
Hide MessageActionBar on message edit history dialog if neither redac…
Browse files Browse the repository at this point in the history
…t nor view source button is rendered inside it

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
  • Loading branch information
luixxiul committed Mar 24, 2023
1 parent 75f31de commit 247e7d2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
19 changes: 13 additions & 6 deletions res/css/views/dialogs/_MessageEditHistoryDialog.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,20 @@ limitations under the License.
}
}

.mx_MessageActionBar .mx_AccessibleButton {
display: flex;
align-items: center;
.mx_MessageActionBar {
&.mx_MessageActionBar--noButton {
/* Hide if neither redact nor view source button is rendered inside it */
display: none;
}

.mx_AccessibleButton {
display: flex;
align-items: center;

padding-inline-start: $spacing-8;
padding-inline-end: $spacing-8;
padding-inline-start: $spacing-8;
padding-inline-end: $spacing-8;

font-size: $font-15px;
font-size: $font-15px;
}
}
}
6 changes: 5 additions & 1 deletion src/components/views/messages/EditHistoryMessage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,13 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
);
}

const classes = classNames("mx_MessageActionBar", {
"mx_MessageActionBar--noButton": !SettingsStore.getValue("developerMode") && !redactButton,
});

// disabled remove button when not allowed
return (
<div className="mx_MessageActionBar">
<div className={classes}>
{redactButton}
{viewSourceButton}
</div>
Expand Down

0 comments on commit 247e7d2

Please sign in to comment.