Merge remote-tracking branch 'parent/main' into kb-upstream-20231026

This commit is contained in:
KMY 2023-10-26 20:24:34 +09:00
commit 5448bcf276
313 changed files with 3717 additions and 4735 deletions

View file

@ -12,7 +12,6 @@
@import 'mastodon/forms';
@import 'mastodon/accounts';
@import 'mastodon/statuses';
@import 'mastodon/boost';
@import 'mastodon/components';
@import 'mastodon/polls';
@import 'mastodon/modal';

File diff suppressed because one or more lines are too long

View file

@ -53,7 +53,10 @@
box-sizing: border-box;
color: $ui-button-color;
cursor: pointer;
display: inline-block;
display: inline-flex;
align-items: center;
justify-content: center;
gap: 6px;
font-family: inherit;
font-size: 15px;
font-weight: 500;
@ -167,9 +170,13 @@
}
&.button--block {
display: block;
width: 100%;
}
.icon {
width: 18px;
height: 18px;
}
}
.column__wrapper {
@ -178,15 +185,30 @@
position: relative;
}
.icon {
flex: 0 0 auto;
width: 20px;
height: 20px;
aspect-ratio: 1;
path {
fill: currentColor;
}
}
.icon-button {
display: inline-block;
padding: 0;
display: inline-flex;
color: $action-button-color;
border: 0;
padding: 2px;
border-radius: 4px;
background: transparent;
cursor: pointer;
align-items: center;
justify-content: center;
text-decoration: none;
gap: 4px;
flex: 0 0 auto;
a {
color: inherit;
@ -258,17 +280,9 @@
}
}
&--with-counter {
display: inline-flex;
align-items: center;
width: auto !important;
padding: 0 4px 0 2px;
}
&__counter {
display: inline-block;
display: block;
width: auto;
margin-inline-start: 4px;
font-size: 12px;
font-weight: 500;
}
@ -625,6 +639,11 @@ body > [data-popper-placement] {
padding: 10px;
font-family: inherit;
.icon {
width: 15px;
height: 15px;
}
&:hover,
&:focus,
&:active {
@ -670,6 +689,11 @@ body > [data-popper-placement] {
.compose-form__buttons {
display: flex;
gap: 2px;
.icon-button {
height: 100%;
}
.compose-form__upload-button-icon {
line-height: 27px;
@ -744,10 +768,6 @@ body > [data-popper-placement] {
&:hover {
text-decoration: underline;
.fa {
color: lighten($dark-text-color, 7%);
}
}
}
}
@ -862,10 +882,6 @@ body > [data-popper-placement] {
&:hover {
text-decoration: underline;
.fa {
color: lighten($dark-text-color, 7%);
}
}
&.mention {
@ -877,10 +893,6 @@ body > [data-popper-placement] {
}
}
}
.fa {
color: $dark-text-color;
}
}
a.unhandled-link {
@ -966,7 +978,8 @@ body > [data-popper-placement] {
.status__content__read-more-button,
.status__content__translate-button {
display: block;
display: flex;
align-items: center;
font-size: 15px;
line-height: 22px;
color: $highlight-text-color;
@ -980,6 +993,11 @@ body > [data-popper-placement] {
&:active {
text-decoration: underline;
}
.icon {
width: 15px;
height: 15px;
}
}
.translate-button {
@ -1192,6 +1210,12 @@ body > [data-popper-placement] {
.status__visibility-icon {
padding: 0 4px;
.icon {
width: 1em;
height: 1em;
margin-bottom: -2px;
}
}
.status__display-name {
@ -1414,6 +1438,13 @@ body > [data-popper-placement] {
color: $dark-text-color;
font-size: 14px;
line-height: 18px;
.icon {
width: 15px;
height: 15px;
position: relative;
top: 0.145em;
}
}
.detailed-status__action-bar {
@ -1452,18 +1483,24 @@ body > [data-popper-placement] {
}
.detailed-status__link {
display: inline-flex;
align-items: center;
color: inherit;
text-decoration: none;
white-space: nowrap;
gap: 6px;
position: relative;
top: 0.145em;
.icon {
top: 0;
}
}
.detailed-status__favorites,
.detailed-status__reblogs {
display: inline-block;
font-weight: 500;
font-size: 12px;
line-height: 17px;
margin-inline-start: 6px;
line-height: 18px;
}
.reply-indicator__content {
@ -1813,10 +1850,17 @@ a.account__display-name {
line-height: 22px;
font-weight: 500;
display: flex;
align-items: center;
gap: 10px;
.fa {
.icon {
color: $highlight-text-color;
width: 18px;
height: 18px;
}
.icon-star {
color: $gold-star;
}
> span {
@ -1826,12 +1870,6 @@ a.account__display-name {
}
}
.notification__favourite-icon-wrapper {
.star-icon {
color: $gold-star;
}
}
.icon-button.star-icon.active {
color: $gold-star;
}
@ -1842,13 +1880,13 @@ a.account__display-name {
.no-reduce-motion .icon-button.star-icon {
&.activate {
& > .fa-star {
& > .icon {
animation: spring-rotate-in 1s linear;
}
}
&.deactivate {
& > .fa-star {
& > .icon {
animation: spring-rotate-out 1s linear;
}
}
@ -1978,6 +2016,11 @@ a.account__display-name {
pointer-events: auto;
transform: scale(1, 1) translate(0, 0);
opacity: 1;
.icon {
width: 24px;
height: 24px;
}
}
}
}
@ -2044,7 +2087,8 @@ a.account__display-name {
z-index: 9999;
&__text-button {
display: inline;
display: inline-flex;
align-items: center;
color: inherit;
background: transparent;
border: 0;
@ -2057,6 +2101,11 @@ a.account__display-name {
&:focus-visible {
outline: 1px dotted;
}
.icon {
width: 15px;
height: 15px;
}
}
&__container {
@ -2260,6 +2309,11 @@ $ui-header-height: 55px;
.button-tertiary {
flex-shrink: 1;
}
.icon {
width: 22px;
height: 22px;
}
}
}
@ -2274,14 +2328,6 @@ $ui-header-height: 55px;
padding-top: 10px;
top: 0;
}
.tabs-bar {
margin-bottom: 0;
@media screen and (min-width: $no-gap-breakpoint) {
margin-bottom: 10px;
}
}
}
.react-swipeable-view-container {
@ -2331,13 +2377,15 @@ $ui-header-height: 55px;
}
.drawer__tab {
display: block;
display: flex;
flex: 1 1 auto;
padding: 15px 5px 13px;
color: $darker-text-color;
text-decoration: none;
text-align: center;
font-size: 16px;
align-items: center;
justify-content: center;
border-bottom: 2px solid transparent;
}
@ -2377,61 +2425,6 @@ $ui-header-height: 55px;
}
}
.tabs-bar {
box-sizing: border-box;
display: flex;
background: lighten($ui-base-color, 8%);
flex: 0 0 auto;
overflow-y: auto;
}
.tabs-bar__link {
display: block;
flex: 1 1 auto;
padding: 15px 10px;
padding-bottom: 13px;
color: $primary-text-color;
text-decoration: none;
text-align: center;
font-size: 14px;
font-weight: 500;
border-bottom: 2px solid lighten($ui-base-color, 8%);
transition: all 50ms linear;
transition-property: border-bottom, background, color;
.fa {
font-weight: 400;
font-size: 16px;
}
&:hover,
&:focus,
&:active {
@media screen and (width >= 631px) {
background: lighten($ui-base-color, 14%);
border-bottom-color: lighten($ui-base-color, 14%);
}
}
&.active {
border-bottom: 2px solid $highlight-text-color;
color: $highlight-text-color;
}
span {
margin-inline-start: 5px;
display: none;
}
}
@media screen and (width >= 600px) {
.tabs-bar__link {
span {
display: inline;
}
}
}
.columns-area--mobile {
flex-direction: column;
width: 100%;
@ -2484,10 +2477,6 @@ $ui-header-height: 55px;
}
@media screen and (min-width: $no-gap-breakpoint) {
.tabs-bar {
width: 100%;
}
.react-swipeable-view-container .columns-area--mobile {
height: calc(100% - 10px) !important;
}
@ -2496,10 +2485,6 @@ $ui-header-height: 55px;
margin-bottom: 10px;
}
.tabs-bar__link.optional {
display: none;
}
.search-page .search {
display: none;
}
@ -2599,6 +2584,7 @@ $ui-header-height: 55px;
}
.icon-with-badge {
display: inline-flex;
position: relative;
&__badge {
@ -3064,13 +3050,14 @@ $ui-header-height: 55px;
position: relative;
overflow: hidden;
display: flex;
border-radius: 4px;
}
.drawer__inner {
position: absolute;
top: 0;
inset-inline-start: 0;
background: lighten($ui-base-color, 13%);
background: $ui-base-color;
box-sizing: border-box;
padding: 0;
display: flex;
@ -3086,7 +3073,7 @@ $ui-header-height: 55px;
}
.drawer__inner__mastodon {
background: lighten($ui-base-color, 13%)
background: $ui-base-color
url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>')
no-repeat bottom / 100% auto;
flex: 1;
@ -3117,20 +3104,15 @@ $ui-header-height: 55px;
.drawer__header {
flex: 0 0 auto;
font-size: 16px;
background: lighten($ui-base-color, 8%);
background: $ui-base-color;
margin-bottom: 10px;
display: flex;
flex-direction: row;
border-radius: 4px;
overflow: hidden;
a {
transition: background 100ms ease-in;
&:hover {
background: lighten($ui-base-color, 3%);
transition: background 200ms ease-out;
}
a:hover {
background: lighten($ui-base-color, 3%);
}
}
@ -3189,6 +3171,8 @@ $ui-header-height: 55px;
margin: 0;
z-index: 3;
outline: 0;
display: flex;
align-items: center;
&:hover {
text-decoration: underline;
@ -3196,6 +3180,8 @@ $ui-header-height: 55px;
}
.column-header__back-button {
display: flex;
align-items: center;
background: $ui-base-color;
border: 0;
font-family: inherit;
@ -3361,7 +3347,9 @@ $ui-header-height: 55px;
.column-link {
background: lighten($ui-base-color, 8%);
color: $primary-text-color;
display: block;
display: flex;
align-items: center;
gap: 5px;
font-size: 16px;
padding: 15px;
text-decoration: none;
@ -3798,8 +3786,9 @@ a.status-card {
background: lighten($ui-base-color, 8%);
position: relative;
& > .fa {
font-size: 21px;
& > .icon {
width: 18px;
height: 18px;
position: absolute;
transform-origin: 50% 50%;
top: 50%;
@ -4007,6 +3996,9 @@ a.status-card {
outline: 0;
& > button {
display: flex;
align-items: center;
gap: 5px;
margin: 0;
border: 0;
padding: 15px;
@ -4056,6 +4048,9 @@ a.status-card {
}
.column-header__button {
display: flex;
justify-content: center;
align-items: center;
background: $ui-base-color;
border: 0;
color: $darker-text-color;
@ -4162,7 +4157,9 @@ a.status-card {
}
.text-btn {
display: inline-block;
display: inline-flex;
align-items: center;
gap: 4px;
padding: 0;
font-family: inherit;
font-size: inherit;
@ -4170,6 +4167,11 @@ a.status-card {
border: 0;
background: transparent;
cursor: pointer;
.icon {
width: 13px;
height: 13px;
}
}
.column-header__issue-btn {
@ -4181,11 +4183,6 @@ a.status-card {
}
}
.column-header__icon {
display: inline-block;
margin-inline-end: 5px;
}
.loading-indicator {
color: $dark-text-color;
font-size: 12px;
@ -4954,10 +4951,11 @@ a.status-card {
color: $lighter-text-color;
overflow: hidden;
display: flex;
gap: 10px;
.fa {
font-size: 34px;
margin-inline-end: 10px;
.icon {
width: 24px;
height: 24px;
}
span {
@ -5176,6 +5174,9 @@ a.status-card {
font-weight: 500;
padding: 10px;
border-radius: 4px;
display: flex;
gap: 6px;
align-items: center;
&:focus,
&:active,
@ -5231,6 +5232,15 @@ a.status-card {
margin-bottom: 10px;
}
.icon-button {
padding: 0;
}
.icon {
width: 18px;
height: 18px;
}
&__menu {
margin-bottom: 20px;
@ -5339,17 +5349,16 @@ a.status-card {
outline: 0 !important;
}
.fa {
.icon {
position: absolute;
top: 16px;
top: 13px;
inset-inline-end: 10px;
display: inline-block;
opacity: 0;
transition: all 100ms linear;
transition-property: transform, opacity;
font-size: 18px;
width: 18px;
height: 18px;
width: 24px;
height: 24px;
color: $secondary-text-color;
cursor: default;
pointer-events: none;
@ -5360,7 +5369,7 @@ a.status-card {
}
}
.fa-search {
.icon-search {
transform: rotate(90deg);
&.active {
@ -5369,8 +5378,7 @@ a.status-card {
}
}
.fa-times-circle {
top: 17px;
.icon-times-circle {
transform: rotate(0deg);
color: $action-button-color;
cursor: pointer;
@ -5393,11 +5401,9 @@ a.status-card {
font-weight: 500;
font-size: 16px;
cursor: default;
.fa {
display: inline-block;
margin-inline-end: 5px;
}
display: flex;
align-items: center;
gap: 5px;
}
.search-results__section {
@ -5417,8 +5423,10 @@ a.status-card {
display: flex;
justify-content: space-between;
h3 .fa {
margin-inline-end: 5px;
h3 {
display: flex;
align-items: center;
gap: 5px;
}
button {
@ -5845,19 +5853,6 @@ a.status-card {
flex-direction: column;
}
.actions-modal {
.status {
background: $white;
border-bottom-color: $ui-secondary-color;
padding-top: 10px;
padding-bottom: 10px;
}
.dropdown-menu__separator {
border-bottom-color: $ui-secondary-color;
}
}
.boost-modal__container {
overflow-x: scroll;
padding: 10px;
@ -6228,11 +6223,6 @@ a.status-card {
max-height: 80vh;
max-width: 80vw;
.status {
overflow-y: auto;
max-height: 300px;
}
.actions-modal__item-label {
font-weight: 500;
}
@ -6440,7 +6430,9 @@ a.status-card {
}
.media-gallery__gifv__label {
display: block;
display: flex;
align-items: center;
justify-content: center;
color: $white;
background: rgba($black, 0.65);
backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
@ -6451,6 +6443,11 @@ a.status-card {
z-index: 1;
pointer-events: none;
line-height: 18px;
.icon {
width: 15px;
height: 15px;
}
}
.attachment-list {
@ -6472,10 +6469,6 @@ a.status-card {
align-items: center;
justify-content: center;
font-size: 26px;
.fa {
display: block;
}
}
&__list {
@ -6510,7 +6503,7 @@ a.status-card {
display: block;
}
.fa {
.icon {
color: $dark-text-color;
}
}
@ -6826,18 +6819,17 @@ a.status-card {
flex: 0 1 auto;
min-width: 30px;
align-items: center;
font-size: 16px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
gap: 5px;
.player-button {
display: inline-block;
outline: 0;
padding: 5px;
flex: 0 0 auto;
background: transparent;
padding: 5px;
font-size: 16px;
border: 0;
color: rgba($white, 0.75);
@ -7228,7 +7220,6 @@ noscript {
$duration: 400ms;
$delay: 100ms;
.tabs-bar,
.search {
will-change: margin-top;
transition: margin-top $duration $delay;
@ -7271,7 +7262,6 @@ noscript {
}
.is-composing {
.tabs-bar,
.search {
margin-top: -50px;
}
@ -8065,24 +8055,14 @@ noscript {
font-weight: 500;
text-decoration: none;
}
.icon {
width: 16px;
height: 16px;
}
}
.trends {
&__header {
color: $dark-text-color;
background: lighten($ui-base-color, 2%);
border-bottom: 1px solid darken($ui-base-color, 4%);
font-weight: 500;
padding: 15px;
font-size: 16px;
cursor: default;
.fa {
display: inline-block;
margin-inline-end: 5px;
}
}
&__item {
display: flex;
align-items: center;
@ -8580,10 +8560,9 @@ noscript {
color: $darker-text-color;
aspect-ratio: 16 / 9;
i {
display: block;
font-size: 24px;
font-weight: 400;
.icon {
width: 24px;
height: 24px;
margin-bottom: 10px;
}
@ -8644,15 +8623,11 @@ noscript {
border: 1px solid lighten($ui-base-color, 8%);
}
.search .fa {
top: 10px;
.search .icon {
top: 9px;
inset-inline-end: 10px;
color: $dark-text-color;
}
.search .fa-times-circle {
top: 12px;
}
}
.explore__search-results {
@ -9577,6 +9552,9 @@ noscript {
margin-bottom: 10px;
&__title {
display: flex;
align-items: center;
gap: 6px;
font-size: 17px;
font-weight: 600;
line-height: 22px;