Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

This commit is contained in:
KMY 2025-06-12 10:17:21 +09:00
commit f3c3ea42c2
301 changed files with 6618 additions and 3070 deletions

View file

@ -283,36 +283,6 @@
}
}
.activity-stream {
border: 1px solid var(--background-border-color);
&--under-tabs {
border-top: 0;
}
.entry {
background: $white;
.detailed-status.light,
.more.light,
.status.light {
border-bottom-color: lighten($ui-base-color, 8%);
}
}
.status.light {
.status__content {
color: $primary-text-color;
}
.display-name {
strong {
color: $primary-text-color;
}
}
}
}
.accounts-grid {
.account-grid-card {
.controls {
@ -416,13 +386,6 @@
}
}
.mute-modal select {
border: 1px solid var(--background-border-color);
background: $simple-background-color
url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 8%))}'/></svg>")
no-repeat right 8px center / auto 16px;
}
.status__wrapper-direct {
background-color: rgba($ui-highlight-color, 0.1);

View file

@ -1,4 +1,6 @@
@use 'sass:color';
@use 'sass:string';
@use 'sass:meta';
$darken-multiplier: -1 !default;
$lighten-multiplier: 1 !default;
@ -19,3 +21,11 @@ $lighten-multiplier: 1 !default;
$space: hsl
);
}
@function hex-color($color) {
@if meta.type-of($color) == 'color' {
$color: string.slice(color.ie-hex-str($color), 4);
}
@return '%23' + string.unquote($color);
}

View file

@ -585,16 +585,6 @@ body,
.account-status {
display: flex;
margin-bottom: 10px;
.activity-stream {
flex: 2 0 0;
margin-inline-end: 20px;
max-width: calc(100% - 60px);
.entry {
border-radius: 4px;
}
}
}
.report-status__actions,

View file

@ -1,14 +1,6 @@
@use 'variables' as *;
@use 'functions' as *;
@function hex-color($color) {
@if type-of($color) == 'color' {
$color: str-slice(ie-hex-str($color), 4);
}
@return '%23' + unquote($color);
}
body {
font-family: $font-sans-serif, sans-serif;
background: var(--background-color);

View file

@ -1473,43 +1473,6 @@ body > [data-popper-placement] {
margin-top: 16px;
}
&.light {
.status__relative-time,
.status__visibility-icon {
color: $light-text-color;
}
.status__display-name {
color: $inverted-text-color;
}
.display-name {
color: $light-text-color;
strong {
color: $inverted-text-color;
}
}
.status__content {
color: $inverted-text-color;
a {
color: $highlight-text-color;
}
&__spoiler-link {
color: $primary-text-color;
background: $ui-primary-color;
&:hover,
&:focus {
background: lighten($ui-primary-color, 8%);
}
}
}
}
&--is-quote {
border: none;
}
@ -1952,16 +1915,18 @@ body > [data-popper-placement] {
}
.status__quote {
--quote-margin: 36px;
position: relative;
margin-block-start: 16px;
margin-inline-start: 36px;
margin-inline-start: calc(var(--quote-margin) + var(--thread-margin, 0px));
border-radius: 8px;
color: var(--nested-card-text);
background: var(--nested-card-background);
border: var(--nested-card-border);
@media screen and (min-width: $mobile-breakpoint) {
margin-inline-start: 56px;
@container (width > 460px) {
--quote-margin: 56px;
}
}
@ -2021,7 +1986,7 @@ body > [data-popper-placement] {
transform: translateY(-50%);
}
@media screen and (min-width: $mobile-breakpoint) {
@container (width > 460px) {
inset-inline-start: -50px;
}
}
@ -2238,6 +2203,16 @@ body > [data-popper-placement] {
display: flex;
gap: 10px;
align-items: center;
justify-content: end;
}
.account__wrapper--with-bio {
align-items: start;
}
.account__info-wrapper {
flex: 1 1 auto;
min-width: 0;
}
.account__avatar {
@ -2246,6 +2221,11 @@ body > [data-popper-placement] {
border-radius: var(--avatar-border-radius);
background: var(--surface-background-color);
@container (width < 360px) {
width: 35px !important;
height: 35px !important;
}
img {
width: 100%;
height: 100%;
@ -2371,7 +2351,7 @@ a .account__avatar {
}
.account__relationship,
.explore__suggestions__card {
.explore-suggestions-card {
.icon-button {
border: 1px solid var(--background-border-color);
border-radius: 4px;
@ -2717,15 +2697,13 @@ a.account__display-name {
min-width: 0;
&__display-name {
font-size: 16px;
line-height: 24px;
letter-spacing: 0.15px;
font-size: 14px;
line-height: 20px;
font-weight: 500;
.display-name__account {
font-size: 14px;
line-height: 20px;
letter-spacing: 0.1px;
font-weight: 400;
}
}
}
@ -2953,6 +2931,7 @@ a.account__display-name {
display: flex;
flex-direction: column;
contain: inline-size layout paint style;
container: column / inline-size;
@media screen and (min-width: $no-gap-breakpoint) {
max-width: 600px;
@ -2961,45 +2940,32 @@ a.account__display-name {
}
}
$ui-header-height: 55px;
$ui-header-logo-wordmark-width: 99px;
.ui__header {
display: none;
box-sizing: border-box;
height: $ui-header-height;
.ui__navigation-bar {
position: sticky;
top: 0;
z-index: 3;
justify-content: space-between;
align-items: center;
bottom: 0;
background: var(--background-color);
backdrop-filter: var(--background-filter);
border-top: 1px solid var(--background-border-color);
z-index: 3;
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
padding-bottom: env(safe-area-inset-bottom);
&__logo {
display: inline-flex;
padding: 15px;
flex-grow: 1;
flex-shrink: 1;
overflow: hidden;
container: header-logo / inline-size;
.layout-multiple-columns & {
display: none;
}
.logo {
height: $ui-header-height - 30px;
width: auto;
}
&__items {
display: grid;
grid-auto-columns: minmax(0, 1fr);
grid-auto-flow: column;
padding: 0 16px;
.logo--wordmark {
display: none;
}
@container header-logo (min-width: #{$ui-header-logo-wordmark-width}) {
.logo--wordmark {
display: block;
}
.logo--icon {
display: none;
}
&.active {
flex: 1;
padding: 0;
}
@media screen and (width < 330px) {
@ -3013,25 +2979,42 @@ $ui-header-logo-wordmark-width: 99px;
}
}
&__links {
&__sign-up {
display: flex;
align-items: center;
gap: 8px;
padding: 0 9px;
padding-inline-start: 16px;
overflow: hidden;
flex-shrink: 0;
}
.button {
flex: 0 0 auto;
&__item {
display: flex;
flex-direction: column;
align-items: center;
background: transparent;
border: none;
gap: 8px;
font-size: 12px;
font-weight: 500;
line-height: 16px;
padding-top: 11px;
padding-bottom: 15px;
border-top: 4px solid transparent;
text-decoration: none;
color: inherit;
&.active {
color: $highlight-text-color;
}
.button-tertiary {
flex-shrink: 1;
&:focus {
outline: 0;
}
.icon {
width: 22px;
height: 22px;
&:focus-visible {
border-top-color: $ui-button-focus-outline-color;
border-radius: 0;
}
}
}
@ -3040,13 +3023,12 @@ $ui-header-logo-wordmark-width: 99px;
background: var(--background-color);
backdrop-filter: var(--background-filter);
position: sticky;
top: $ui-header-height;
top: 0;
z-index: 2;
padding-top: 0;
@media screen and (min-width: $no-gap-breakpoint) {
padding-top: 10px;
top: 0;
}
}
@ -3215,8 +3197,11 @@ $ui-header-logo-wordmark-width: 99px;
display: none;
}
.navigation-panel__legal {
display: none;
.navigation-panel__legal,
.navigation-panel__compose-button,
.navigation-panel .navigation-bar,
.navigation-panel__refresh {
display: none !important;
}
}
@ -3228,7 +3213,7 @@ $ui-header-logo-wordmark-width: 99px;
}
.columns-area__panels {
min-height: calc(100vh - $ui-header-height);
min-height: 100vh;
gap: 0;
}
@ -3246,28 +3231,18 @@ $ui-header-logo-wordmark-width: 99px;
}
.navigation-panel__sign-in-banner,
.navigation-panel__logo,
.navigation-panel__banner,
.getting-started__trends {
.getting-started__trends,
.navigation-panel__logo {
display: none;
}
.navigation-panel__legal {
margin-bottom: 100px;
}
.column-link__icon {
font-size: 18px;
}
}
.layout-single-column {
.ui__header {
display: flex;
background: var(--background-color);
border-bottom: 1px solid var(--background-border-color);
}
.column > .scrollable,
.tabs-bar__wrapper .column-header,
.tabs-bar__wrapper .column-back-button,
@ -3291,31 +3266,65 @@ $ui-header-logo-wordmark-width: 99px;
}
}
@media screen and (max-width: $no-gap-breakpoint - 285px - 1px) {
$sidebar-width: 55px;
@media screen and (width <= 759px) {
.columns-area__panels__main {
width: calc(100% - $sidebar-width);
width: 100%;
}
.columns-area__panels__pane--navigational {
min-width: $sidebar-width;
position: fixed;
inset-inline-end: 0;
width: 100%;
height: 100%;
pointer-events: none;
}
.columns-area__panels__pane__inner {
width: $sidebar-width;
}
.columns-area__panels__pane--navigational .columns-area__panels__pane__inner {
pointer-events: auto;
background: var(--background-color);
position: fixed;
width: 284px + 70px;
inset-inline-end: -70px;
touch-action: pan-y;
.column-link span {
display: none;
}
.navigation-panel {
width: 284px;
overflow-y: auto;
.list-panel {
display: none;
&__menu {
flex-shrink: 0;
min-height: none;
overflow: hidden;
padding-bottom: calc(65px + env(safe-area-inset-bottom));
}
&__logo {
display: none;
}
}
}
}
.explore__suggestions__card {
.columns-area__panels__pane--navigational {
transition: background 500ms;
}
.columns-area__panels__pane--overlay {
pointer-events: auto;
background: rgba($base-overlay-background, 0.5);
.columns-area__panels__pane__inner {
box-shadow: var(--dropdown-shadow);
}
}
@media screen and (width >= 760px) {
.ui__navigation-bar {
display: none;
}
}
.explore-suggestions-card {
padding: 12px 16px;
gap: 8px;
display: flex;
@ -3327,60 +3336,77 @@ $ui-header-logo-wordmark-width: 99px;
}
&__source {
padding-inline-start: 60px;
font-size: 13px;
line-height: 16px;
color: $dark-text-color;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@container (width >= 400px) {
padding-inline-start: 60px;
}
}
&__body {
display: flex;
gap: 12px;
align-items: center;
justify-content: end;
}
&__main {
flex: 1 1 auto;
display: flex;
flex-direction: column;
gap: 8px;
min-width: 0;
&__avatar {
flex-shrink: 0;
&__name-button {
display: flex;
align-items: center;
gap: 8px;
@container (width < 360px) {
width: 35px !important;
height: 35px !important;
}
}
&__name {
display: block;
color: inherit;
text-decoration: none;
flex: 1 1 auto;
min-width: 0;
}
&__link {
flex: 1 1 auto;
display: flex;
gap: 12px;
align-items: center;
text-decoration: none;
min-width: 0;
.button {
min-width: 80px;
}
.display-name {
font-size: 15px;
line-height: 20px;
color: $secondary-text-color;
strong {
font-weight: 700;
}
&__account {
color: $darker-text-color;
display: block;
}
}
&:hover,
&:focus-visible {
.display-name__html {
text-decoration: underline;
}
}
.display-name {
font-size: 15px;
line-height: 20px;
color: $secondary-text-color;
strong {
font-weight: 700;
}
&__account {
color: $darker-text-color;
display: block;
}
}
}
&__actions {
display: flex;
align-items: center;
gap: 8px;
justify-content: end;
.button {
min-width: 80px;
}
}
&__dismiss-button {
@container (width < 400px) {
display: none;
}
}
}
@ -3541,6 +3567,49 @@ $ui-header-logo-wordmark-width: 99px;
overflow-y: auto;
}
&__list-panel {
&__header {
display: flex;
align-items: center;
padding-inline-end: 12px;
.column-link {
flex: 1 1 auto;
}
}
&__items {
padding-inline-start: 24px + 5px;
.icon {
display: none;
}
}
}
&__compose-button {
display: flex;
justify-content: flex-start;
padding-top: 10px;
padding-bottom: 10px;
padding-inline-start: 13px - 7px;
padding-inline-end: 13px;
gap: 5px;
margin: 12px;
margin-bottom: 4px;
border-radius: 6px;
.icon {
width: 24px;
height: 24px;
}
}
.navigation-bar {
padding: 16px;
border-bottom: 1px solid var(--background-border-color);
}
.logo {
height: 30px;
width: auto;
@ -3573,12 +3642,6 @@ $ui-header-logo-wordmark-width: 99px;
display: none;
}
}
// @media screen and (height <= 1040px) {
// .list-panel {
// display: none;
// }
// }
}
.navigation-panel,
@ -4506,6 +4569,10 @@ a.status-card {
&:focus-visible {
outline: $ui-button-icon-focus-outline;
}
.logo {
height: 24px;
}
}
.column-header__back-button + &__title {
@ -4589,10 +4656,6 @@ a.status-card {
&:hover {
color: $primary-text-color;
}
.icon-sliders {
transform: rotate(60deg);
}
}
&:disabled {
@ -6096,6 +6159,7 @@ a.status-card {
position: absolute;
top: 0;
bottom: 0;
transform: scaleX(var(--text-x-direction));
&:hover,
&:focus,
@ -6104,11 +6168,11 @@ a.status-card {
}
}
.media-modal__nav--left {
.media-modal__nav--prev {
inset-inline-start: 0;
}
.media-modal__nav--right {
.media-modal__nav--next {
inset-inline-end: 0;
}
@ -6122,7 +6186,9 @@ a.status-card {
.picture-in-picture__footer {
border-radius: 0;
border: none;
background: transparent;
backdrop-filter: none;
padding: 16px;
.icon-button {
@ -6590,6 +6656,7 @@ a.status-card {
@media screen and (max-width: $no-columns-breakpoint) {
border-bottom: 0;
border-radius: 4px 4px 0 0;
padding-bottom: env(safe-area-inset-bottom);
}
}
@ -6911,7 +6978,6 @@ a.status-card {
ul {
overflow-y: auto;
flex-shrink: 0;
padding-bottom: 8px;
}
@ -6950,24 +7016,6 @@ a.status-card {
}
}
}
select {
appearance: none;
box-sizing: border-box;
font-size: 14px;
color: $inverted-text-color;
display: inline-block;
width: auto;
outline: 0;
font-family: inherit;
background: $simple-background-color
url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(darken($simple-background-color, 14%))}'/></svg>")
no-repeat right 8px center / auto 16px;
border: 1px solid darken($simple-background-color, 14%);
border-radius: 4px;
padding: 6px 10px;
padding-inline-end: 30px;
}
}
.report-modal__target {
@ -7397,18 +7445,19 @@ a.status-card {
}
.audio-player {
overflow: hidden;
box-sizing: border-box;
container: audio-player / inline-size;
position: relative;
background: var(--player-background-color, var(--background-color));
color: var(--player-foreground-color);
border-radius: 8px;
padding-bottom: 44px;
overflow: hidden;
display: flex;
flex-direction: column;
width: 100%;
aspect-ratio: 16 / 9;
color: var(--player-foreground-color);
background: var(--player-background-color, var(--background-color));
border-radius: 8px;
outline: 1px solid var(--media-outline-color);
outline-offset: -1px;
aspect-ratio: 16 / 9;
container: audio-player / inline-size;
&__controls {
display: grid;
@ -7457,9 +7506,17 @@ a.status-card {
}
&__visualizer {
width: 100%;
max-width: 200px;
}
.video-player__seek {
position: absolute;
inset: 0 0 auto;
height: 24px;
z-index: 1; /* Ensure this renders on top of audio player controls */
}
&.inactive {
.video-player__seek,
.audio-player__controls,
@ -8421,7 +8478,6 @@ noscript {
.avatar {
display: block;
flex: 0 0 auto;
width: 94px;
.account__avatar {
background: var(--background-color);
@ -8655,6 +8711,20 @@ noscript {
font-weight: 400;
margin-bottom: 10px;
&__loading-indicator-wrapper {
position: relative;
height: 37px;
.loading-indicator {
left: 10px;
}
.circular-progress {
width: 14px;
height: 14px;
}
}
label {
display: block;
font-size: 12px;
@ -11245,7 +11315,7 @@ noscript {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 10px;
gap: 2px 10px;
}
&__numbers {
@ -11542,7 +11612,7 @@ noscript {
overflow: hidden;
flex-shrink: 0;
border-bottom: 1px solid var(--background-border-color);
touch-action: pan-x;
touch-action: pan-y;
&__slides {
display: flex;
@ -11553,6 +11623,8 @@ noscript {
&__slide {
flex: 0 0 auto;
flex-basis: 100%;
width: 100%;
overflow: hidden;
}
.status {
@ -11573,5 +11645,13 @@ noscript {
font-size: 12px;
font-weight: 500;
text-transform: uppercase;
display: flex;
align-items: center;
gap: 4px;
.icon {
width: 16px;
height: 16px;
}
}
}

View file

@ -41,3 +41,12 @@
--detail-content-emoji-size: 24px;
--detail-content-line-height: 24px;
}
body {
// Variable for easily inverting directional UI elements,
--text-x-direction: 1;
&.rtl {
--text-x-direction: -1;
}
}