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

Browse source
This commit is contained in:
KMY 2024-08-21 12:39:30 +09:00
commit af0f8f01e1
136 changed files with 693 additions and 756 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/styles/mastodon/accounts.scss
View file

@ -66,7 +66,7 @@
margin-inline-start: 15px;
text-align: start;
i[data-hidden] {
svg[data-hidden] {
display: none;
}

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

@ -774,16 +774,6 @@ body > [data-popper-placement] {
gap: 12px;
flex-wrap: wrap;
.button {
display: block; // Otherwise text-ellipsis doesn't work
font-size: 14px;
line-height: normal;
font-weight: 700;
flex: 1 1 auto;
padding: 5px 12px;
border-radius: 4px;
}
.icon-button {
box-sizing: content-box;
color: $highlight-text-color;
@ -4362,7 +4352,7 @@ a.status-card {
text-decoration: none;
&:hover {
background: lighten($ui-base-color, 2%);
background: var(--on-surface-color);
}
}
@ -4495,19 +4485,18 @@ a.status-card {
display: flex;
}
&__selection-mode {
flex-grow: 1;
.text-btn:hover {
text-decoration: underline;
}
&__select-menu:disabled {
visibility: hidden;
}
&__actions {
.icon-button {
border-radius: 4px;
border: 1px solid var(--background-border-color);
padding: 5px;
&__mode-button {
margin-left: auto;
color: $highlight-text-color;
font-weight: bold;
font-size: 14px;
&:hover {
color: lighten($highlight-text-color, 6%);
}
}
}
@ -4715,6 +4704,7 @@ a.status-card {
padding: 0;
font-family: inherit;
font-size: inherit;
font-weight: inherit;
color: inherit;
border: 0;
background: transparent;
@ -7864,10 +7854,6 @@ a.status-card {
}
}
::-webkit-scrollbar-thumb {
border-radius: 0;
}
noscript {
text-align: center;
@ -10799,7 +10785,7 @@ noscript {
cursor: pointer;
&:hover {
background: lighten($ui-base-color, 1%);
background: var(--on-surface-color);
}
.notification-request__checkbox {
@ -10986,8 +10972,10 @@ noscript {
}
&__additional-content {
color: $darker-text-color;
color: $dark-text-color;
margin-top: -8px; // to offset the parent's `gap` property
font-size: 15px;
line-height: 22px;
}
}
@ -11041,6 +11029,19 @@ noscript {
}
}
.notification-group__actions,
.compose-form__actions {
.button {
display: block; // Otherwise text-ellipsis doesn't work
font-size: 14px;
line-height: normal;
font-weight: 700;
flex: 1 1 auto;
padding: 5px 12px;
border-radius: 4px;
}
}
.notification-ungrouped {
padding: 16px 24px;
border-bottom: 1px solid var(--background-border-color);

19
app/javascript/styles/mastodon/reset.scss
View file

@ -53,22 +53,29 @@ table {
border-spacing: 0;
}
html {
scrollbar-color: var(--background-border-color);
@supports not selector(::-webkit-scrollbar) {
html {
scrollbar-color: $action-button-color var(--background-border-color);
scrollbar-width: thin;
}
}
::-webkit-scrollbar {
width: 4px;
height: 4px;
width: 8px;
height: 8px;
}
::-webkit-scrollbar-thumb {
background-color: $ui-highlight-color;
opacity: .25;
background-color: $action-button-color;
border: 2px var(--background-border-color);
border-radius: 12px;
width: 6px;
box-shadow: inset 0 0 0 2px var(--background-border-color);
}
::-webkit-scrollbar-track {
background-color: var(--background-border-color);
border-radius: 0px;
}
::-webkit-scrollbar-corner {

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

@ -7,8 +7,8 @@ $blurple-600: #563acc; // Iris
$blurple-500: #6364ff; // Brand purple
$blurple-400: #7477fd; // Medium slate blue
$blurple-300: #858afa; // Faded Blue
$grey-600: #4e4c5a; // Trout
$grey-100: #dadaf3; // Topaz
$grey-600: hsl(240deg, 8%, 33%); // Trout
$grey-100: hsl(240deg, 51%, 90%); // Topaz
$success-green: #79bd9a !default; // Padua
$error-red: $red-500 !default; // Cerise
@ -19,10 +19,10 @@ $kmyblue: #29a5f7 !default;
$red-bookmark: $warning-red;
// Values from the classic Mastodon UI
$classic-base-color: #282c37; // Midnight Express
$classic-primary-color: #9baec8; // Echo Blue
$classic-secondary-color: #d9e1e8; // Pattens Blue
$classic-highlight-color: #6364ff; // Brand purple
$classic-base-color: hsl(240deg, 16%, 19%);
$classic-primary-color: hsl(240deg, 29%, 70%);
$classic-secondary-color: hsl(255deg, 25%, 88%);
$classic-highlight-color: $blurple-500;
// Values for kmyblue original functions
$emoji-reaction-color: #42485a !default;
@ -114,6 +114,7 @@ $font-monospace: 'mastodon-font-monospace' !default;
--surface-background-color: #{darken($ui-base-color, 4%)};
--surface-variant-background-color: #{$ui-base-color};
--surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
--on-surface-color: #{transparentize($ui-base-color, 0.5)};
--avatar-border-radius: 8px;
--content-font-size: 15px;
--content-line-height: 22px;