mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-16 01:09:55 +00:00
Merge branch 'stable-4.3' into glitch-soc/backports-4.3
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.
This commit is contained in:
@@ -226,6 +226,10 @@ $content-width: 840px;
|
||||
gap: 5px;
|
||||
white-space: nowrap;
|
||||
|
||||
@media screen and (max-width: $mobile-breakpoint) {
|
||||
flex: 1 0 50%;
|
||||
}
|
||||
|
||||
&:hover,
|
||||
&:focus,
|
||||
&:active {
|
||||
@@ -1070,6 +1074,10 @@ a.name-tag,
|
||||
}
|
||||
}
|
||||
|
||||
.icon {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
a.announcements-list__item__title {
|
||||
&:hover,
|
||||
&:focus,
|
||||
|
||||
@@ -3611,6 +3611,7 @@ $ui-header-logo-wordmark-width: 99px;
|
||||
overflow-y: auto;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.drawer__inner__mastodon {
|
||||
|
||||
@@ -137,6 +137,7 @@ a.table-action-link {
|
||||
padding: 0 10px;
|
||||
color: $darker-text-color;
|
||||
font-weight: 500;
|
||||
white-space: nowrap;
|
||||
|
||||
&:hover {
|
||||
color: $highlight-text-color;
|
||||
|
||||
Reference in New Issue
Block a user