sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
Essem 2024-08-03 18:36:56 -05:00
commit 845f95bc5d
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
246 changed files with 2288 additions and 1095 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,3 @@
@mixin avatar-radius {
border-radius: 4px;
background: transparent no-repeat;
background-position: 50%;
background-clip: padding-box;
}
@mixin avatar-size($size: 48px) {
width: $size;
height: $size;
background-size: $size $size;
}
@mixin search-input {
outline: 0;
box-sizing: border-box;

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

@ -66,10 +66,6 @@ body {
}
}
&.lighter {
background: $ui-base-color;
}
&.with-modals {
overflow-x: hidden;
overflow-y: scroll;
@ -109,7 +105,6 @@ body {
}
&.embed {
background: lighten($ui-base-color, 4%);
margin: 0;
padding-bottom: 0;
@ -122,15 +117,12 @@ body {
}
&.admin {
background: var(--background-color);
padding: 0;
}
&.error {
position: absolute;
text-align: center;
color: $darker-text-color;
background: $ui-base-color;
width: 100%;
height: 100%;
padding: 0;

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

@ -1980,17 +1980,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 {
@ -2027,6 +2025,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 {
@ -10171,25 +10192,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;
}
}
@ -10230,6 +10236,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 {