gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240326

Browse source
This commit is contained in:
KMY 2024-03-26 09:08:20 +09:00
commit 6c9b221cb2
263 changed files with 4628 additions and 1518 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/javascript/styles/mastodon/admin.scss
View file

@ -1387,6 +1387,19 @@ a.sparkline {
.account-card {
border-radius: 4px;
border: 1px solid lighten($ui-base-color, 8%);
position: relative;
&__warning-badge {
position: absolute;
padding: 4px 10px;
top: 10px;
inset-inline-start: 10px;
border-radius: 4px;
background:
url('../images/warning-stripes.svg') repeat-y left,
url('../images/warning-stripes.svg') repeat-y right,
var(--background-color);
}
&__permalink {
color: inherit;

105
app/javascript/styles/mastodon/components.scss
View file

@ -1757,6 +1757,7 @@ body > [data-popper-placement] {
.animated-number {
color: $secondary-text-color;
font-weight: 500;
}
}
@ -2242,6 +2243,44 @@ a.account__display-name {
}
}
.notification__relationships-severance-event {
display: flex;
gap: 16px;
color: $secondary-text-color;
text-decoration: none;
align-items: flex-start;
padding: 16px 32px;
border-bottom: 1px solid var(--background-border-color);
&:hover {
color: $primary-text-color;
}
.icon {
padding: 2px;
color: $highlight-text-color;
}
&__content {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 8px;
flex-grow: 1;
font-size: 16px;
line-height: 24px;
strong {
font-weight: 700;
}
.link-button {
font-size: inherit;
line-height: inherit;
}
}
}
.notification__message {
padding: 16px;
padding-bottom: 0;
@ -5105,6 +5144,11 @@ a.status-card {
position: relative;
margin-top: 5px;
z-index: 2;
background: var(--dropdown-background-color);
backdrop-filter: var(--background-filter);
border: 1px solid var(--dropdown-border-color);
box-shadow: var(--dropdown-shadow);
border-radius: 5px;
.emoji-mart-scroll {
transition: opacity 200ms ease;
@ -9016,6 +9060,12 @@ noscript {
color: $darker-text-color;
margin-bottom: 15px;
text-align: center;
.icon {
width: 20px;
height: 20px;
vertical-align: middle;
}
}
}
@ -9247,8 +9297,9 @@ noscript {
.safety-action-modal,
.interaction-modal {
max-width: 90vw;
max-width: 100vw;
width: 600px;
overflow-y: auto;
}
.interaction-modal {
@ -10151,18 +10202,24 @@ noscript {
margin-top: 16px;
display: flex;
flex-wrap: wrap;
font-size: 14px;
line-height: 18px;
gap: 4px;
font-size: 12px;
line-height: 16px;
gap: 6px;
color: $darker-text-color;
a {
display: inline-flex;
color: inherit;
text-decoration: none;
padding: 4px 12px;
background: $ui-base-color;
border-radius: 4px;
font-weight: 500;
&:hover span {
text-decoration: underline;
&:hover,
&:focus,
&:active {
background: lighten($ui-base-color, 4%);
}
}
@ -10378,10 +10435,10 @@ noscript {
.filtered-notifications-banner {
display: flex;
align-items: center;
background: $ui-base-color;
border-bottom: 1px solid lighten($ui-base-color, 8%);
padding: 15px;
gap: 15px;
border: 1px solid var(--background-border-color);
border-top: 0;
padding: 24px 32px;
gap: 16px;
color: $darker-text-color;
text-decoration: none;
@ -10389,15 +10446,12 @@ noscript {
&:active,
&:focus {
color: $secondary-text-color;
.filtered-notifications-banner__badge {
background: $secondary-text-color;
}
}
.icon {
width: 24px;
height: 24px;
padding: 2px;
}
&__text {
@ -10413,13 +10467,24 @@ noscript {
}
&__badge {
background: $darker-text-color;
color: $ui-base-color;
border-radius: 100px;
padding: 2px 8px;
display: flex;
align-items: center;
border-radius: 999px;
background: var(--background-border-color);
color: $darker-text-color;
padding: 4px;
padding-inline-end: 8px;
gap: 6px;
font-weight: 500;
font-size: 11px;
line-height: 16px;
&__badge {
background: $ui-button-background-color;
color: $white;
border-radius: 100px;
padding: 2px 8px;
}
}
}
@ -10428,7 +10493,7 @@ noscript {
align-items: center;
gap: 16px;
padding: 15px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
border-bottom: 1px solid var(--background-border-color);
&__link {
display: flex;
@ -10476,7 +10541,7 @@ noscript {
.icon-button {
border-radius: 4px;
border: 1px solid lighten($ui-base-color, 8%);
border: 1px solid var(--background-border-color);
padding: 5px;
}
}

15
app/javascript/styles/mastodon/emoji_picker.scss
View file

@ -14,21 +14,9 @@
}
.emoji-mart-bar {
border: 0 solid var(--dropdown-border-color);
&:first-child {
border-bottom-width: 1px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
background: var(--dropdown-border-color);
}
&:last-child {
border-top-width: 1px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
display: none;
}
}
.emoji-mart-anchors {
@ -94,7 +82,6 @@
height: 270px;
max-height: 35vh;
padding: 0 6px 6px;
background: var(--dropdown-background-color);
will-change: transform;
&::-webkit-scrollbar-track:hover,
@ -106,7 +93,6 @@
.emoji-mart-search {
padding: 10px;
padding-inline-end: 45px;
background: var(--dropdown-background-color);
position: relative;
input {
@ -200,7 +186,6 @@
width: 100%;
font-weight: 500;
padding: 5px 6px;
background: var(--dropdown-background-color);
}
}

8
app/javascript/styles/mastodon/rich_text.scss
View file

@ -1,6 +1,7 @@
.account__header__bio,
.status__content__text,
.e-content,
.edit-indicator__content,
.reply-indicator__content {
pre,
blockquote {
@ -100,10 +101,3 @@
color: red !important;
}
}
.reply-indicator__content {
blockquote {
border-left-color: $inverted-text-color;
color: $inverted-text-color;
}
}