Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] Fix report username wrapping #1464

Merged
merged 2 commits into from
Feb 9, 2023
Merged

[chore] Fix report username wrapping #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf69f4d
fix report username wrapping
f0x52 Feb 8, 2023
f11faa2
move report status to separate line on portrait orientation
f0x52 Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/source/settings/admin/reports/detail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function ReportDetailForm({ data: report }) {

return (
<div className="report detail">
<div>
<div className="usernames">
<Username user={from} /> reported <Username user={target} />
</div>

Expand Down
2 changes: 1 addition & 1 deletion web/source/settings/admin/reports/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function ReportEntry({ report }) {
<Link to={`${baseUrl}/${report.id}`}>
<a className={`report entry${report.action_taken ? " resolved" : ""}`}>
<div className="byline">
<div className="users">
<div className="usernames">
<Username user={from} link={false} /> reported <Username user={target} link={false} />
</div>
<h3 className="status">
Expand Down
4 changes: 2 additions & 2 deletions web/source/settings/admin/reports/username.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = function Username({ user, link = true }) {
? { fa: "fa-home", info: "Local user" }
: { fa: "fa-external-link-square", info: "Remote user" };

let Element = "span";
let Element = "div";
let href = null;

if (link) {
Expand All @@ -46,7 +46,7 @@ module.exports = function Username({ user, link = true }) {

return (
<Element className={className} href={href} target="_blank" rel="noreferrer" >
@{user.account.acct}
<span className="acct">@{user.account.acct}</span>
<i className={`fa fa-fw ${icon.fa}`} aria-hidden="true" title={icon.info} />
<span className="sr-only">{icon.info}</span>
</Element>
Expand Down
23 changes: 22 additions & 1 deletion web/source/settings/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,9 +828,14 @@ button.with-padding {
border: none;
border-left: 0.3rem solid $border-accent;

.usernames {
line-height: 2rem;
}

.byline {
display: grid;
grid-template-columns: 1fr auto;
gap: 0.5rem;

.status {
color: $border-accent;
Expand Down Expand Up @@ -904,14 +909,20 @@ button.with-padding {
}

.user {
line-height: 1.3rem;
display: inline-block;
background: $fg-accent;
color: $bg;
border-radius: $br;
padding: 0.1rem 0.2rem;
padding: 0.15rem 0.15rem;
margin: 0 0.1rem;
font-weight: bold;
text-decoration: none;

.acct {
word-break: break-all;
}

&.suspended {
background: $bg-accent;
color: $fg;
Expand All @@ -924,6 +935,16 @@ button.with-padding {
}
}

@media screen and (orientation: portrait) {
.reports .report .byline {
grid-template-columns: 1fr;

.status {
grid-row: 1;
}
}
}

[role="button"] {
cursor: pointer;
}
Expand Down