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

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

Browse source
This commit is contained in:
KMY 2024-08-06 08:16:16 +09:00
commit 8e5fe5ccb9
166 changed files with 2268 additions and 1390 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2050,17 +2050,15 @@ body > [data-popper-placement] {
}
.account__avatar {
@include avatar-radius;
display: block;
position: relative;
overflow: hidden;
img {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 4px;
}
&-inline {
@ -2097,6 +2095,29 @@ body > [data-popper-placement] {
font-size: 15px;
}
}
&__counter {
$height: 16px;
$h-padding: 5px;
position: absolute;
bottom: -3px;
inset-inline-end: -3px;
padding-left: $h-padding;
padding-right: $h-padding;
height: $height;
border-radius: $height;
min-width: $height - 2 * $h-padding; // to ensure that it is never narrower than a circle
line-height: $height + 1px; // to visually center the numbers
background-color: $ui-button-background-color;
color: $white;
border-width: 1px;
border-style: solid;
border-color: var(--background-color);
font-size: 11px;
font-weight: 500;
text-align: center;
}
}
a .account__avatar {
@ -3159,6 +3180,11 @@ $ui-header-logo-wordmark-width: 99px;
.explore__search-header {
display: flex;
}
.explore__search-results {
border: 0;
border-radius: 0;
}
}
.icon-with-badge {
@ -7635,7 +7661,7 @@ a.status-card {
display: flex;
flex-shrink: 0;
@media screen and (max-width: $no-gap-breakpoint) {
@media screen and (max-width: $no-gap-breakpoint - 1px) {
border-right: 0;
border-left: 0;
}
@ -8485,16 +8511,17 @@ noscript {
.verified {
border: 1px solid rgba($valid-value-color, 0.5);
margin-top: -1px;
margin-inline: -1px;
&:first-child {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
margin-top: 0;
}
&:last-child {
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
margin-bottom: -1px;
}
dt,
@ -10602,25 +10629,10 @@ noscript {
}
&__badge {
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;
word-break: keep-all;
&__badge {
background: $ui-button-background-color;
color: $white;
border-radius: 100px;
padding: 2px 8px;
}
background: $ui-button-background-color;
color: $white;
border-radius: 100px;
padding: 2px 8px;
}
}
@ -10661,6 +10673,12 @@ noscript {
letter-spacing: 0.5px;
line-height: 24px;
color: $secondary-text-color;
bdi {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.filtered-notifications-banner__badge {