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 7c10b0fb7a078661558fef86399d86831423260c #2884

Merged
merged 44 commits into from
Oct 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0c16365
Prefer native apps over PWA (#27254)
jake-anto Oct 7, 2024
c60d4ec
Update dependency @reduxjs/toolkit to v2.2.8 (#32296)
renovate[bot] Oct 8, 2024
562105c
Fix source strings being uploaded to crowdin in merge groups (#32298)
ClearlyClaire Oct 8, 2024
ff3e2c9
New Crowdin Translations (automated) (#32295)
github-actions[bot] Oct 8, 2024
c3a38c7
Update changelog and security policy (#32300)
ClearlyClaire Oct 8, 2024
022c1ae
Remove unused deprecator configuration (#32288)
mjankowski Oct 8, 2024
d20a899
Bring icon vertical middle to applications list style (#32293)
mjankowski Oct 8, 2024
3cf2d35
Reference `IpBlock.severities` keys from CLI option check (#32291)
mjankowski Oct 8, 2024
f49161a
Oauth system spec cleanup / helper method extraction (#32287)
mjankowski Oct 8, 2024
e8ec666
Extract wrapper constant for `HTTP::*` error classes (#32285)
mjankowski Oct 8, 2024
258dce1
Add `OpenSSL::SSL::SSLError` to http connection errors wrapper (#32307)
mjankowski Oct 8, 2024
0d91db3
Fix `latest` tag for 4.3 docker image builds (#32350)
ClearlyClaire Oct 9, 2024
6d6565e
Update dependency express to v4.21.1 (#32336)
renovate[bot] Oct 9, 2024
fda52b2
Fix 4 columns barely not fitting on 1920px screen (#32361)
ClearlyClaire Oct 9, 2024
03dbebd
Fix list edition modal styling (#32358)
ClearlyClaire Oct 9, 2024
d9fbb07
Fix notification requests from suspended accounts still being listed …
ClearlyClaire Oct 9, 2024
cdf6032
Restore list column border (#32367)
vmstan Oct 9, 2024
a5a3733
Fix “Mention” appearing for otherwise filtered posts (#32356)
ClearlyClaire Oct 10, 2024
9350cd3
Update dependency postcss-preset-env to v10.0.7 (#32389)
renovate[bot] Oct 10, 2024
3b07fe1
Fix “Mark every notification as read” not updating the read marker if…
ClearlyClaire Oct 10, 2024
22fd767
Fix mute duration not being shown in list of muted accounts in web UI…
ClearlyClaire Oct 10, 2024
bb0cf04
Add note about not changing ActiveRecord encryption secrets once they…
ClearlyClaire Oct 11, 2024
10ea6da
Fix language of push notifications (#32415)
ClearlyClaire Oct 11, 2024
e15befe
Add tag with commit hash to PR image builds (#32418)
ClearlyClaire Oct 11, 2024
b0dd384
Fix follow recommendation suppressions not applying immediately (#32392)
ClearlyClaire Oct 14, 2024
de422a3
Update dependency fuzzysort to v3.1.0 (#32460)
renovate[bot] Oct 14, 2024
e9eac64
Update devDependencies (non-major) (#32457)
renovate[bot] Oct 14, 2024
05bc82e
Update dependency use-debounce to v10.0.4 (#32452)
renovate[bot] Oct 14, 2024
555fb98
Update dependency typescript to v5.6.3 (#32456)
renovate[bot] Oct 14, 2024
2343ce4
Update dependency rack to v2.2.10 (#32455)
renovate[bot] Oct 14, 2024
06d6b35
Convert `admin/tags` controller specs to system specs (#32447)
mjankowski Oct 14, 2024
2404d6d
Added Swiss German to languages dropdown (#29281)
FlohEinstein Oct 14, 2024
d8eab3d
Reinforce coverage for `DomainBlock` model (#32473)
mjankowski Oct 14, 2024
cc70acc
Augment coverage for `Status` model (#32468)
mjankowski Oct 14, 2024
ffa1032
Add further warnings about encryption secrets (#32476)
ClearlyClaire Oct 14, 2024
7c10b0f
Fix follow recommendation carrousel scrolling on RTL layouts (#32462)
ClearlyClaire Oct 14, 2024
4d9b4ef
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-s…
ClearlyClaire Oct 14, 2024
6cedbb4
[Glitch] Bring icon vertical middle to applications list style
mjankowski Oct 8, 2024
39723a4
[Glitch] Fix list edition modal styling
ClearlyClaire Oct 9, 2024
1a9be3e
[Glitch] Restore list column border
vmstan Oct 9, 2024
9b3aaa9
[Glitch] Fix “Mention” appearing for otherwise filtered posts
ClearlyClaire Oct 10, 2024
71a6ced
[Glitch] Fix “Mark every notification as read” not updating the read …
ClearlyClaire Oct 10, 2024
075eb3e
[Glitch] Fix mute duration not being shown in list of muted accounts …
ClearlyClaire Oct 10, 2024
ab50b26
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts
ClearlyClaire Oct 14, 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 list edition modal styling (mastodon#32358)
  • Loading branch information
ClearlyClaire authored Oct 9, 2024
commit 03dbebdfef47eda19b1b86e56004119f723e667e
83 changes: 36 additions & 47 deletions app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7961,7 +7961,6 @@ noscript {
justify-content: flex-start;
gap: 15px;
align-items: center;
border: 1px solid var(--background-border-color);
border-top: 0;

label {
Expand All @@ -7988,18 +7987,50 @@ noscript {
background: rgba($base-overlay-background, 0.5);
}

.list-adder,
.list-editor {
background: $ui-base-color;
backdrop-filter: var(--background-filter);
background: var(--modal-background-color);
border: 1px solid var(--modal-border-color);
flex-direction: column;
border-radius: 8px;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
width: 380px;
overflow: hidden;

@media screen and (width <= 420px) {
width: 90%;
}
}

.list-adder {
&__lists {
height: 50vh;
border-radius: 0 0 8px 8px;
overflow-y: auto;
}

.list {
padding: 10px;
border-bottom: 1px solid var(--background-border-color);
}

.list__wrapper {
display: flex;
}

.list__display-name {
flex: 1 1 auto;
overflow: hidden;
text-decoration: none;
font-size: 16px;
padding: 10px;
display: flex;
align-items: center;
gap: 4px;
}
}

.list-editor {
h4 {
padding: 15px 0;
background: lighten($ui-base-color, 13%);
Expand All @@ -8011,12 +8042,10 @@ noscript {

.drawer__pager {
height: 50vh;
border-radius: 4px;
border: 0;
}

.drawer__inner {
border-radius: 0 0 8px 8px;

&.backdrop {
width: calc(100% - 60px);
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
Expand All @@ -8025,6 +8054,7 @@ noscript {
}

&__accounts {
background: unset;
overflow-y: auto;
}

Expand All @@ -8043,47 +8073,6 @@ noscript {
}
}

.list-adder {
background: $ui-base-color;
flex-direction: column;
border-radius: 8px;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
width: 380px;
overflow: hidden;

@media screen and (width <= 420px) {
width: 90%;
}

&__account {
background: lighten($ui-base-color, 13%);
}

&__lists {
background: lighten($ui-base-color, 13%);
height: 50vh;
border-radius: 0 0 8px 8px;
overflow-y: auto;
}

.list {
padding: 10px;
border-bottom: 1px solid var(--background-border-color);
}

.list__wrapper {
display: flex;
}

.list__display-name {
flex: 1 1 auto;
overflow: hidden;
text-decoration: none;
font-size: 16px;
padding: 10px;
}
}

.focal-point {
position: relative;
cursor: move;
Expand Down