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

Browse source
This commit is contained in:
KMY 2024-08-22 09:18:29 +09:00
commit 55f11765ea
34 changed files with 401 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,21 +130,11 @@
.older {
float: left;
padding-inline-start: 0;
.fa {
display: inline-block;
margin-inline-end: 5px;
}
}
.newer {
float: right;
padding-inline-end: 0;
.fa {
display: inline-block;
margin-inline-start: 5px;
}
}
.disabled {

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

@ -122,10 +122,6 @@ $content-width: 840px;
overflow: hidden;
text-overflow: ellipsis;
i.fa {
margin-inline-end: 5px;
}
&:hover {
color: $primary-text-color;
transition: all 100ms linear;
@ -306,10 +302,6 @@ $content-width: 840px;
box-shadow: none;
}
.directory__tag .table-action-link .fa {
color: inherit;
}
.directory__tag h4 {
font-size: 18px;
font-weight: 700;

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

@ -2981,10 +2981,6 @@ $ui-header-logo-wordmark-width: 99px;
padding-inline-end: 30px;
}
.search__icon .fa {
top: 15px;
}
.scrollable {
overflow: visible;
@ -3520,26 +3516,6 @@ $ui-header-logo-wordmark-width: 99px;
height: calc(100% - 10px);
overflow-y: hidden;
.hero-widget {
box-shadow: none;
&__text,
&__img,
&__img img {
border-radius: 0;
}
&__text {
padding: 15px;
color: $secondary-text-color;
strong {
font-weight: 700;
color: $primary-text-color;
}
}
}
.compose-form {
flex: 1 1 auto;
min-height: 0;
@ -6529,7 +6505,7 @@ a.status-card {
}
.boost-modal__container {
overflow-x: scroll;
overflow-y: auto;
padding: 10px;
.status {

4
app/javascript/styles/mastodon/dashboard.scss
View file

@ -113,10 +113,6 @@
flex: 1 1 auto;
}
.fa {
flex: 0 0 auto;
}
strong {
font-weight: 700;
}

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

@ -942,10 +942,6 @@ code {
font-weight: 700;
}
}
.fa {
font-weight: 400;
}
}
}
}

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

@ -41,14 +41,6 @@ body.rtl {
no-repeat left 8px center / auto 16px;
}
.fa-chevron-left::before {
content: '\F054';
}
.fa-chevron-right::before {
content: '\F053';
}
.dismissable-banner,
.warning-banner {
&__action {

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

@ -142,11 +142,6 @@ a.table-action-link {
color: $highlight-text-color;
}
i.fa {
font-weight: 400;
margin-inline-end: 5px;
}
&:first-child {
padding-inline-start: 0;
}

320
app/javascript/styles/mastodon/widgets.scss
View file

@ -1,295 +1,3 @@
@use 'sass:math';
.hero-widget {
margin-bottom: 10px;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
&:last-child {
margin-bottom: 0;
}
&__img {
width: 100%;
position: relative;
overflow: hidden;
border-radius: 4px 4px 0 0;
background: $base-shadow-color;
img {
object-fit: cover;
display: block;
width: 100%;
height: 100%;
margin: 0;
border-radius: 4px 4px 0 0;
}
}
&__text {
background: $ui-base-color;
padding: 20px;
border-radius: 0 0 4px 4px;
font-size: 15px;
color: $darker-text-color;
line-height: 20px;
word-wrap: break-word;
font-weight: 400;
.emojione {
min-width: 20px;
max-width: min(10em, 100%);
height: 20px;
margin: -3px 0 0;
margin-inline-start: 0.075em;
margin-inline-end: 0.075em;
}
p {
margin-bottom: 20px;
&:last-child {
margin-bottom: 0;
}
}
em {
display: inline;
margin: 0;
padding: 0;
font-weight: 700;
background: transparent;
font-family: inherit;
font-size: inherit;
line-height: inherit;
color: lighten($darker-text-color, 10%);
}
a {
color: $secondary-text-color;
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
}
@media screen and (max-width: $no-gap-breakpoint) {
display: none;
}
}
.endorsements-widget {
margin-bottom: 10px;
padding-bottom: 10px;
h4 {
padding: 10px;
text-transform: uppercase;
font-weight: 700;
font-size: 13px;
color: $darker-text-color;
}
.account {
padding: 10px 0;
&:last-child {
border-bottom: 0;
}
.account__display-name {
display: flex;
align-items: center;
}
}
.trends__item {
padding: 10px;
}
}
.trends-widget {
h4 {
color: $darker-text-color;
}
}
.placeholder-widget {
padding: 16px;
border-radius: 4px;
border: 2px dashed $dark-text-color;
text-align: center;
color: $darker-text-color;
margin-bottom: 10px;
}
.moved-account-widget {
padding: 15px;
padding-bottom: 20px;
border-radius: 4px;
background: $ui-base-color;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
color: $secondary-text-color;
font-weight: 400;
margin-bottom: 10px;
strong,
a {
font-weight: 500;
@each $lang in $cjk-langs {
&:lang(#{$lang}) {
font-weight: 700;
}
}
}
a {
color: inherit;
text-decoration: underline;
&.mention {
text-decoration: none;
span {
text-decoration: none;
}
&:focus,
&:hover,
&:active {
text-decoration: none;
span {
text-decoration: underline;
}
}
}
}
&__message {
margin-bottom: 15px;
.fa {
margin-inline-end: 5px;
color: $darker-text-color;
}
}
&__card {
.detailed-status__display-avatar {
position: relative;
cursor: pointer;
}
.detailed-status__display-name {
margin-bottom: 0;
text-decoration: none;
span {
font-weight: 400;
}
}
}
}
.memoriam-widget {
padding: 20px;
border-radius: 4px;
background: $base-shadow-color;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
font-size: 14px;
color: $darker-text-color;
margin-bottom: 10px;
}
.directory {
background: var(--background-color);
border-radius: 4px;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
&__tag {
box-sizing: border-box;
margin-bottom: 10px;
& > a,
& > div {
display: flex;
align-items: center;
justify-content: space-between;
border: 1px solid var(--background-border-color);
border-radius: 4px;
padding: 15px;
text-decoration: none;
color: inherit;
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
}
& > a {
&:hover,
&:active,
&:focus {
background: $ui-base-color;
}
}
&.active > a {
background: $ui-highlight-color;
cursor: default;
}
&.disabled > div {
opacity: 0.5;
cursor: default;
}
h4 {
flex: 1 1 auto;
font-size: 18px;
font-weight: 700;
color: $primary-text-color;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.fa {
color: $darker-text-color;
}
small {
display: block;
font-weight: 400;
font-size: 15px;
margin-top: 8px;
color: $darker-text-color;
}
}
&.active h4 {
&,
.fa,
small,
.trends__item__current {
color: $primary-text-color;
}
}
.avatar-stack {
flex: 0 0 auto;
width: (36px + 4px) * 3;
}
&.active .avatar-stack .account__avatar {
border-color: $ui-highlight-color;
}
.trends__item__current {
padding-inline-end: 0;
}
}
}
.accounts-table {
width: 100%;
@ -367,9 +75,7 @@
padding-inline-end: 16px;
}
.fa {
font-size: 16px;
.icon {
&.active {
color: $highlight-text-color;
}
@ -389,27 +95,3 @@
}
}
}
.moved-account-widget,
.memoriam-widget,
.directory {
@media screen and (max-width: $no-gap-breakpoint) {
margin-bottom: 0;
box-shadow: none;
border-radius: 0;
}
}
.placeholder-widget {
a {
text-decoration: none;
font-weight: 500;
color: $ui-highlight-color;
&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}
}