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-20241203

Browse source
This commit is contained in:
KMY 2024-12-03 18:03:14 +09:00
commit 2d9124a3ab
214 changed files with 1763 additions and 3380 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -980,7 +980,7 @@ body > [data-popper-placement] {
p {
font-size: 15px;
line-height: 22px;
color: $darker-text-color;
color: $secondary-text-color;
margin-bottom: 20px;
strong {
@ -1091,26 +1091,6 @@ body > [data-popper-placement] {
color: $highlight-text-color;
}
.status__content__spoiler-link {
background: $action-button-color;
&:hover,
&:focus {
background: lighten($action-button-color, 7%);
text-decoration: none;
}
&::-moz-focus-inner {
border: 0;
}
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
}
.status__content__text {
display: none;
@ -1369,21 +1349,6 @@ body > [data-popper-placement] {
color: $dark-text-color;
}
.status__content__spoiler-link {
display: inline-block;
border-radius: 2px;
background: transparent;
border: 0;
color: $inverted-text-color;
font-weight: 700;
font-size: 11px;
padding: 0 6px;
text-transform: uppercase;
line-height: 20px;
cursor: pointer;
vertical-align: top;
}
.status__wrapper--filtered {
color: $dark-text-color;
border: 0;
@ -1800,11 +1765,6 @@ body > [data-popper-placement] {
height: var(--detail-content-emoji-size);
margin: -1px 0 0;
}
.status__content__spoiler-link {
line-height: 24px;
margin: -1px 0 0;
}
}
.media-gallery,
@ -2363,17 +2323,6 @@ a.account__display-name {
.status__avatar {
opacity: 0.5;
}
a.status__content__spoiler-link {
background: $ui-base-lighter-color;
color: $inverted-text-color;
&:hover,
&:focus {
background: lighten($ui-base-lighter-color, 7%);
text-decoration: none;
}
}
}
.notification__report {
@ -6131,119 +6080,44 @@ a.status-card {
}
}
.onboarding-modal,
.error-modal,
.embed-modal {
background: $ui-secondary-color;
color: $inverted-text-color;
border-radius: 8px;
overflow: hidden;
display: flex;
.modal-placeholder {
width: 588px;
min-height: 478px;
flex-direction: column;
}
background: var(--modal-background-color);
backdrop-filter: var(--background-filter);
border: 1px solid var(--modal-border-color);
border-radius: 16px;
.error-modal__body {
height: 80vh;
width: 80vw;
max-width: 520px;
max-height: 420px;
position: relative;
& > div {
position: absolute;
top: 0;
inset-inline-start: 0;
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 25px;
flex-direction: column;
align-items: center;
justify-content: center;
&__error {
padding: 24px;
display: flex;
opacity: 0;
user-select: text;
}
}
align-items: center;
flex-direction: column;
.error-modal__body {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
}
.onboarding-modal__paginator,
.error-modal__footer {
flex: 0 0 auto;
background: darken($ui-secondary-color, 8%);
display: flex;
padding: 25px;
& > div {
min-width: 33px;
}
.onboarding-modal__nav,
.error-modal__nav {
color: $lighter-text-color;
border: 0;
font-size: 14px;
font-weight: 500;
padding: 10px 25px;
line-height: inherit;
height: auto;
margin: -10px;
border-radius: 4px;
background-color: transparent;
&:hover,
&:focus,
&:active {
color: darken($lighter-text-color, 4%);
background-color: darken($ui-secondary-color, 16%);
&__image {
width: 70%;
max-width: 350px;
}
&.onboarding-modal__done,
&.onboarding-modal__next {
color: $inverted-text-color;
&__message {
text-align: center;
text-wrap: balance;
font-size: 14px;
line-height: 20px;
letter-spacing: 0.25px;
&:hover,
&:focus,
&:active {
color: lighten($inverted-text-color, 4%);
&__actions {
margin-top: 24px;
display: flex;
gap: 10px;
align-items: center;
justify-content: center;
}
}
}
}
.error-modal__footer {
justify-content: center;
}
.display-case {
text-align: center;
font-size: 15px;
margin-bottom: 15px;
&__label {
font-weight: 500;
color: $inverted-text-color;
margin-bottom: 5px;
text-transform: uppercase;
font-size: 12px;
}
&__case {
background: $ui-base-color;
color: $secondary-text-color;
font-weight: 500;
padding: 10px;
border-radius: 4px;
}
}
.safety-action-modal {
width: 600px;
flex-direction: column;
@ -6667,15 +6541,6 @@ a.status-card {
color: $primary-text-color;
}
.status__content__spoiler-link {
color: $primary-text-color;
background: $ui-primary-color;
&:hover {
background: lighten($ui-primary-color, 8%);
}
}
.dialog-option {
align-items: center;
gap: 12px;
@ -8434,7 +8299,7 @@ noscript {
}
.icon-button {
border: 1px solid lighten($ui-base-color, 12%);
border: 1px solid var(--background-border-color);
border-radius: 4px;
box-sizing: content-box;
padding: 5px;
@ -10388,6 +10253,30 @@ noscript {
line-height: 33px;
font-weight: 700;
}
&__buttons {
display: flex;
align-items: center;
gap: 8px;
.button {
flex-shrink: 1;
white-space: nowrap;
min-width: 80px;
}
.icon-button {
border: 1px solid var(--background-border-color);
border-radius: 4px;
box-sizing: content-box;
padding: 5px;
.icon {
width: 24px;
height: 24px;
}
}
}
}
}