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

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

Browse source
This commit is contained in:
KMY 2024-12-16 10:14:31 +09:00
commit 3784ad273c
555 changed files with 7564 additions and 3363 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/styles/mailer.scss
View file

@ -173,7 +173,9 @@ table + p {
}
.email-prose {
p {
p,
ul,
ol {
color: #17063b;
font-size: 14px;
line-height: 20px;

6
app/javascript/styles/mastodon-light/diff.scss
View file

@ -3,6 +3,12 @@
.simple_form .button.button-tertiary {
color: $highlight-text-color;
&:hover,
&:focus,
&:active {
color: $white;
}
}
.status-card__actions button,

5
app/javascript/styles/mastodon/about.scss
View file

@ -21,7 +21,6 @@ $fluid-breakpoint: $maximum-width + 20px;
.rules-list {
font-size: 15px;
line-height: 22px;
color: $primary-text-color;
counter-reset: list-counter;
li {
@ -82,6 +81,10 @@ $fluid-breakpoint: $maximum-width + 20px;
}
}
&__text {
color: $primary-text-color;
}
&__hint {
font-size: 14px;
font-weight: 400;

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

@ -253,6 +253,10 @@ $content-width: 840px;
.time-period {
padding: 0 10px;
}
.back-link {
margin-bottom: 0;
}
}
h2 small {
@ -1947,3 +1951,76 @@ a.sparkline {
}
}
}
.admin {
&__terms-of-service {
&__container {
background: var(--surface-background-color);
border-radius: 8px;
border: 1px solid var(--background-border-color);
overflow: hidden;
&__header {
padding: 16px;
font-size: 14px;
line-height: 20px;
color: $secondary-text-color;
display: flex;
align-items: center;
gap: 12px;
}
&__body {
background: var(--background-color);
padding: 16px;
overflow-y: scroll;
height: 30vh;
}
}
&__history {
& > li {
border-bottom: 1px solid var(--background-border-color);
&:last-child {
border-bottom: 0;
}
}
&__item {
padding: 16px 0;
padding-bottom: 8px;
h5 {
font-size: 14px;
line-height: 20px;
font-weight: 600;
margin-bottom: 16px;
}
}
}
}
}
.dot-indicator {
display: inline-flex;
align-items: center;
gap: 8px;
font-weight: 500;
&__indicator {
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
background: $dark-text-color;
}
&.success {
color: $valid-value-color;
.dot-indicator__indicator {
background-color: $valid-value-color;
}
}
}

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

@ -136,13 +136,7 @@ body {
&.embed {
margin: 0;
padding-bottom: 0;
.container {
position: absolute;
width: 100%;
height: 100%;
overflow: hidden;
}
overflow: hidden;
}
&.admin {

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

@ -108,7 +108,7 @@
&:disabled,
&.disabled {
background-color: $ui-primary-color;
background-color: $ui-button-disabled-color;
cursor: not-allowed;
}
@ -148,14 +148,14 @@
&:disabled,
&.disabled {
opacity: 0.7;
border-color: $ui-primary-color;
color: $ui-primary-color;
border-color: $ui-button-disabled-color;
color: $ui-button-disabled-color;
&:active,
&:focus,
&:hover {
border-color: $ui-primary-color;
color: $ui-primary-color;
border-color: $ui-button-disabled-color;
color: $ui-button-disabled-color;
}
}
}
@ -2030,6 +2030,8 @@ body > [data-popper-placement] {
}
&__handle {
overflow: hidden;
text-overflow: ellipsis;
user-select: all;
}
}
@ -3111,7 +3113,9 @@ $ui-header-logo-wordmark-width: 99px;
.column > .scrollable,
.tabs-bar__wrapper .column-header,
.tabs-bar__wrapper .column-back-button {
.tabs-bar__wrapper .column-back-button,
.explore__search-header,
.column-search-header {
border-left: 0;
border-right: 0;
}
@ -3154,10 +3158,6 @@ $ui-header-logo-wordmark-width: 99px;
}
}
.explore__search-header {
display: none;
}
.explore__suggestions__card {
padding: 12px 16px;
gap: 8px;
@ -3231,10 +3231,6 @@ $ui-header-logo-wordmark-width: 99px;
.columns-area__panels__pane--compositional {
display: none;
}
.explore__search-header {
display: flex;
}
}
.icon-with-badge {
@ -5728,6 +5724,17 @@ a.status-card {
}
.search__icon {
background: transparent;
border: 0;
padding: 0;
position: absolute;
top: 12px + 2px;
cursor: default;
pointer-events: none;
margin-inline-start: 16px - 2px;
width: 20px;
height: 20px;
&::-moz-focus-inner {
border: 0;
}
@ -5739,17 +5746,14 @@ a.status-card {
.icon {
position: absolute;
top: 12px + 2px;
display: inline-block;
top: 0;
inset-inline-start: 0;
opacity: 0;
transition: all 100ms linear;
transition-property: transform, opacity;
width: 20px;
height: 20px;
color: $darker-text-color;
cursor: default;
pointer-events: none;
margin-inline-start: 16px - 2px;
&.active {
pointer-events: auto;
@ -8358,6 +8362,8 @@ noscript {
text-overflow: ellipsis;
span {
overflow: hidden;
text-overflow: ellipsis;
user-select: all;
}
@ -9085,10 +9091,13 @@ noscript {
}
.explore__search-header {
background: darken($ui-base-color, 4%);
justify-content: center;
align-items: center;
padding: 15px;
border: 1px solid var(--background-border-color);
border-top: 0;
border-bottom: 0;
padding: 16px;
padding-bottom: 8px;
.search {
width: 100%;
@ -9097,7 +9106,7 @@ noscript {
.search__input {
border: 1px solid var(--background-border-color);
padding: 10px;
padding: 12px;
padding-inline-end: 30px;
}
@ -9105,13 +9114,21 @@ noscript {
border: 1px solid var(--background-border-color);
}
.search .icon {
top: 9px;
inset-inline-end: 10px;
.search__icon {
top: 12px;
inset-inline-end: 12px;
color: $dark-text-color;
}
}
.layout-single-column .explore__search-header {
display: none;
@media screen and (max-width: $no-gap-breakpoint - 1px) {
display: flex;
}
}
.explore__search-results {
flex: 1 1 auto;
display: flex;

14
app/javascript/styles/mastodon/forms.scss
View file

@ -596,8 +596,9 @@ code {
background-color: $ui-button-focus-background-color;
}
&:disabled,
&:disabled:hover {
background-color: $ui-primary-color;
background-color: $ui-button-disabled-color;
}
&.negative {
@ -611,16 +612,6 @@ code {
}
}
.button.button-tertiary {
padding: 9px;
&:hover,
&:focus,
&:active {
padding: 10px;
}
}
select {
appearance: none;
box-sizing: border-box;
@ -1189,6 +1180,7 @@ code {
align-items: center;
padding-bottom: 30px;
margin-bottom: 30px;
color: $white;
li {
flex: 0 0 auto;

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

@ -149,6 +149,14 @@ a.table-action-link {
}
.batch-table {
&--no-toolbar {
.batch-table__toolbar {
position: static;
height: 4px;
border-bottom: none;
}
}
&__toolbar,
&__row {
display: flex;

7
app/javascript/styles/mastodon/variables.scss
View file

@ -1,3 +1,5 @@
@use 'sass:color';
// Commonly used web colors
$black: #000000; // Black
$white: #ffffff; // White
@ -51,6 +53,11 @@ $ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-disabled-color: color.adjust(
$ui-button-background-color,
$alpha: -0.3
) !default;
$ui-button-secondary-color: $blurple-500 !default;
$ui-button-secondary-border-color: $blurple-500 !default;
$ui-button-secondary-focus-border-color: $blurple-300 !default;