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.

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

Merge upstream changes up to 70988519df66f0b8edeb6ca95140f1d3e436fea8 #2856

Merged
merged 17 commits into from
Sep 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d54ce67
Change hide media button to be in top right corner in web UI (#32048)
Gargron Sep 24, 2024
c808055
Update dependency webrick (#32054)
ClearlyClaire Sep 24, 2024
11ac5c8
New Crowdin Translations (automated) (#32052)
github-actions[bot] Sep 24, 2024
7c61533
Update dependency aws-sdk-s3 to v1.165.0 (#32050)
renovate[bot] Sep 24, 2024
780e2e9
Convert notification mailer spec shared examples to matchers (#32047)
mjankowski Sep 24, 2024
19dedd7
Set important mailer headers with `after_action` callback (#32057)
mjankowski Sep 24, 2024
cfb8fc6
Increase regexp timeout and allow override (#32056)
oneiros Sep 24, 2024
0a6b75b
Fix multiple bugs in notification requests and notification policies …
ClearlyClaire Sep 24, 2024
c36a76b
Fix error when accepting appeal for sensitive posts deleted in the me…
ClearlyClaire Sep 24, 2024
556837f
Fix the summary of converted object types to be treated as HTML (#28629)
Menrath Sep 24, 2024
f1b6a61
Fix wrapping in dashboard quick access buttons (#32043)
renchap Sep 24, 2024
7098851
Fix too many requests caused by relationship look-ups in web UI (#32042)
Gargron Sep 24, 2024
c6039f9
Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-s…
ClearlyClaire Sep 24, 2024
aac6296
[Glitch] Change hide media button to be in top right corner in web UI
Gargron Sep 24, 2024
1316962
[Glitch] Fix multiple bugs in notification requests and notification …
ClearlyClaire Sep 24, 2024
6142adc
[Glitch] Fix wrapping in dashboard quick access buttons
renchap Sep 24, 2024
ba7b1f0
[Glitch] Fix too many requests caused by relationship look-ups in web UI
Gargron Sep 24, 2024
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
Prev Previous commit
Next Next commit
Fix wrapping in dashboard quick access buttons (mastodon#32043)
renchap authored Sep 24, 2024
commit f1b6a611aab351d9f3658fc8c255694597602d81
4 changes: 1 addition & 3 deletions app/javascript/styles/mastodon/dashboard.scss
Original file line number Diff line number Diff line change
@@ -86,9 +86,7 @@
color: $primary-text-color;
transition: all 100ms ease-in;
font-size: 14px;
padding: 0 16px;
line-height: 36px;
height: 36px;
padding: 8px 16px;
text-decoration: none;
margin-bottom: 4px;