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

This commit is contained in:
KMY 2024-08-13 07:01:38 +09:00
commit e7ccc0539f
358 changed files with 4653 additions and 4261 deletions

View file

@ -7,7 +7,7 @@
background: $ui-base-color;
color: $darker-text-color;
border-radius: 4px;
border: 1px solid lighten($ui-base-color, 8%);
border: 1px solid var(--background-border-color);
font-size: 17px;
line-height: normal;
margin: 0;

View file

@ -13,7 +13,7 @@ $content-width: 840px;
.icon {
width: 16px;
height: 16px;
vertical-align: middle;
vertical-align: top;
margin: 0 2px;
}
@ -65,16 +65,16 @@ $content-width: 840px;
background: $ui-base-color;
}
.fa-times {
.material-close {
display: none;
}
&.active {
.fa-times {
.material-close {
display: block;
}
.fa-bars {
.material-menu {
display: none;
}
}

View file

@ -403,7 +403,7 @@ body > [data-popper-placement] {
&__suggestions {
box-shadow: var(--dropdown-shadow);
background: $ui-base-color;
border: 1px solid lighten($ui-base-color, 14%);
border: 1px solid var(--background-border-color);
border-radius: 0 0 4px 4px;
color: $secondary-text-color;
font-size: 14px;
@ -426,10 +426,17 @@ body > [data-popper-placement] {
&:hover,
&:focus,
&:active,
&:active {
background: var(--dropdown-border-color);
.autosuggest-account .display-name__account {
color: inherit;
}
}
&.selected {
background: $ui-highlight-color;
color: $primary-text-color;
color: $ui-button-color;
.autosuggest-account .display-name__account {
color: inherit;
@ -465,7 +472,7 @@ body > [data-popper-placement] {
display: block;
line-height: 16px;
font-size: 12px;
color: $dark-text-color;
color: $ui-primary-color;
}
}
@ -889,6 +896,13 @@ body > [data-popper-placement] {
text-overflow: ellipsis;
white-space: nowrap;
&[disabled] {
cursor: default;
color: $highlight-text-color;
border-color: $highlight-text-color;
opacity: 0.5;
}
.icon {
width: 15px;
height: 15px;
@ -2869,6 +2883,11 @@ $ui-header-logo-wordmark-width: 99px;
&.privacy-policy {
border-top: 1px solid var(--background-border-color);
border-radius: 4px;
@media screen and (max-width: $no-gap-breakpoint) {
border-top: 0;
border-bottom: 0;
}
}
}
}
@ -3180,11 +3199,6 @@ $ui-header-logo-wordmark-width: 99px;
.explore__search-header {
display: flex;
}
.explore__search-results {
border: 0;
border-radius: 0;
}
}
.icon-with-badge {
@ -3989,18 +4003,17 @@ $ui-header-logo-wordmark-width: 99px;
display: block;
box-sizing: border-box;
margin: 0;
color: $inverted-text-color;
background: $white;
color: $primary-text-color;
background: $ui-base-color;
padding: 7px 10px;
font-family: inherit;
font-size: 14px;
line-height: 22px;
border-radius: 4px;
border: 1px solid $white;
border: 1px solid var(--background-border-color);
&:focus {
outline: 0;
border-color: lighten($ui-highlight-color, 12%);
}
&__wrapper {
@ -4463,6 +4476,36 @@ a.status-card {
}
}
.column-header__select-row {
border-width: 0 1px 1px;
border-style: solid;
border-color: var(--background-border-color);
padding: 15px;
display: flex;
align-items: center;
gap: 8px;
&__checkbox .check-box {
display: flex;
}
&__selection-mode {
flex-grow: 1;
.text-btn:hover {
text-decoration: underline;
}
}
&__actions {
.icon-button {
border-radius: 4px;
border: 1px solid var(--background-border-color);
padding: 5px;
}
}
}
.column-header {
display: flex;
font-size: 16px;
@ -4626,6 +4669,11 @@ a.status-card {
.column-header__collapsible-inner {
border: 1px solid var(--background-border-color);
border-top: 0;
@media screen and (max-width: $no-gap-breakpoint) {
border-left: 0;
border-right: 0;
}
}
.column-header__setting-btn {
@ -6520,9 +6568,10 @@ a.status-card {
max-width: 90vw;
width: 480px;
height: 80vh;
background: lighten($ui-secondary-color, 8%);
color: $inverted-text-color;
border-radius: 8px;
background: var(--background-color);
color: $primary-text-color;
border-radius: 4px;
border: 1px solid var(--background-border-color);
overflow: hidden;
position: relative;
flex-direction: column;
@ -6530,7 +6579,7 @@ a.status-card {
&__container {
box-sizing: border-box;
border-top: 1px solid $ui-secondary-color;
border-top: 1px solid var(--background-border-color);
padding: 20px;
flex-grow: 1;
display: flex;
@ -6560,7 +6609,7 @@ a.status-card {
&__lead {
font-size: 17px;
line-height: 22px;
color: lighten($inverted-text-color, 16%);
color: $secondary-text-color;
margin-bottom: 30px;
a {
@ -6595,7 +6644,7 @@ a.status-card {
.status__content,
.status__content p {
color: $inverted-text-color;
color: $primary-text-color;
}
.status__content__spoiler-link {
@ -6640,7 +6689,7 @@ a.status-card {
.poll__option.dialog-option {
padding: 15px 0;
flex: 0 0 auto;
border-bottom: 1px solid $ui-secondary-color;
border-bottom: 1px solid var(--background-border-color);
&:last-child {
border-bottom: 0;
@ -6648,13 +6697,13 @@ a.status-card {
& > .poll__option__text {
font-size: 13px;
color: lighten($inverted-text-color, 16%);
color: $secondary-text-color;
strong {
font-size: 17px;
font-weight: 500;
line-height: 22px;
color: $inverted-text-color;
color: $primary-text-color;
display: block;
margin-bottom: 4px;
@ -6673,22 +6722,19 @@ a.status-card {
display: block;
box-sizing: border-box;
width: 100%;
color: $inverted-text-color;
background: $simple-background-color;
color: $primary-text-color;
background: $ui-base-color;
padding: 10px;
font-family: inherit;
font-size: 17px;
line-height: 22px;
resize: vertical;
border: 0;
border: 1px solid var(--background-border-color);
outline: 0;
border-radius: 4px;
margin: 20px 0;
&::placeholder {
color: $dark-text-color;
}
&:focus {
outline: 0;
}
@ -6709,16 +6755,16 @@ a.status-card {
}
.button.button-secondary {
border-color: $inverted-text-color;
color: $inverted-text-color;
border-color: $ui-button-destructive-background-color;
color: $ui-button-destructive-background-color;
flex: 0 0 auto;
&:hover,
&:focus,
&:active {
background: transparent;
border-color: $ui-button-background-color;
color: $ui-button-background-color;
background: $ui-button-destructive-background-color;
border-color: $ui-button-destructive-background-color;
color: $white;
}
}
@ -7760,20 +7806,9 @@ a.status-card {
flex: 0 0 auto;
border-radius: 50%;
&.checked {
&.checked,
&.indeterminate {
border-color: $ui-highlight-color;
&::before {
position: absolute;
left: 2px;
top: 2px;
content: '';
display: block;
border-radius: 50%;
width: 12px;
height: 12px;
background: $ui-highlight-color;
}
}
.icon {
@ -7783,19 +7818,28 @@ a.status-card {
}
}
.radio-button.checked::before {
position: absolute;
left: 2px;
top: 2px;
content: '';
display: block;
border-radius: 50%;
width: 12px;
height: 12px;
background: $ui-highlight-color;
}
.check-box {
&__input {
width: 18px;
height: 18px;
border-radius: 2px;
&.checked {
&.checked,
&.indeterminate {
background: $ui-highlight-color;
color: $white;
&::before {
display: none;
}
}
}
}
@ -7964,6 +8008,11 @@ noscript {
width: 100%;
}
}
@media screen and (max-width: $no-gap-breakpoint) {
border-left: 0;
border-right: 0;
}
}
.drawer__backdrop {
@ -8350,7 +8399,8 @@ noscript {
.account__avatar {
background: var(--background-color);
border: 2px solid var(--background-border-color);
border: 1px solid var(--background-border-color);
border-radius: 4px;
}
}
}
@ -9226,10 +9276,13 @@ noscript {
flex: 1 1 auto;
display: flex;
flex-direction: column;
border: 1px solid var(--background-border-color);
border-top: 0;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
@media screen and (min-width: $no-gap-breakpoint) {
border: 1px solid var(--background-border-color);
border-top: 0;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
}
.story {
@ -10637,12 +10690,28 @@ noscript {
}
.notification-request {
$padding: 15px;
display: flex;
align-items: center;
gap: 16px;
padding: 15px;
padding: $padding;
gap: 8px;
position: relative;
border-bottom: 1px solid var(--background-border-color);
&__checkbox {
position: absolute;
inset-inline-start: $padding;
top: 50%;
transform: translateY(-50%);
width: 0;
overflow: hidden;
opacity: 0;
.check-box {
display: flex;
}
}
&__link {
display: flex;
align-items: center;
@ -10700,6 +10769,31 @@ noscript {
padding: 5px;
}
}
.notification-request__link {
transition: padding-inline-start 0.1s ease-in-out;
}
&--forced-checkbox {
cursor: pointer;
&:hover {
background: lighten($ui-base-color, 1%);
}
.notification-request__checkbox {
opacity: 1;
width: 30px;
}
.notification-request__link {
padding-inline-start: 30px;
}
.notification-request__actions {
display: none;
}
}
}
.more-from-author {
@ -11059,6 +11153,25 @@ noscript {
}
}
&__note {
&-label {
color: $dark-text-color;
font-size: 12px;
font-weight: 500;
text-transform: uppercase;
}
dd {
white-space: pre-line;
color: $secondary-text-color;
overflow: hidden;
line-clamp: 3; // Not yet supported in browers
display: -webkit-box; // The next 3 properties are needed
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
}
.display-name {
font-size: 15px;
line-height: 22px;

View file

@ -83,11 +83,6 @@
max-height: 35vh;
padding: 0 6px 6px;
will-change: transform;
&::-webkit-scrollbar-track:hover,
&::-webkit-scrollbar-track:active {
background-color: rgba($base-overlay-background, 0.3);
}
}
.emoji-mart-search {
@ -116,7 +111,6 @@
&:focus {
outline: none !important;
border-width: 1px !important;
border-color: $ui-button-background-color;
}
&::-webkit-search-cancel-button {

View file

@ -302,6 +302,10 @@ code {
flex: 0;
}
.input.select.select--languages {
min-width: 32ch;
}
.required abbr {
text-decoration: none;
color: lighten($error-value-color, 12%);
@ -453,11 +457,6 @@ code {
border-radius: 4px;
padding: 10px 16px;
&::placeholder {
color: $dark-text-color;
opacity: 1;
}
&:invalid {
box-shadow: none;
}
@ -619,8 +618,7 @@ code {
inset-inline-end: 3px;
top: 1px;
padding: 10px;
padding-bottom: 9px;
font-size: 16px;
font-size: 14px;
color: $dark-text-color;
font-family: inherit;
pointer-events: none;
@ -638,11 +636,6 @@ code {
inset-inline-end: 0;
bottom: 1px;
width: 5px;
background-image: linear-gradient(
to right,
rgba(darken($ui-base-color, 10%), 0),
darken($ui-base-color, 10%)
);
}
}
}

View file

@ -35,16 +35,6 @@ body.rtl {
direction: rtl;
}
.simple_form .label_input__append {
&::after {
background-image: linear-gradient(
to left,
rgba(darken($ui-base-color, 10%), 0),
darken($ui-base-color, 10%)
);
}
}
.simple_form select {
background: $ui-base-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, 12%))}'/></svg>")

View file

@ -273,8 +273,8 @@ a.table-action-link {
}
}
&:nth-child(even) {
background: var(--background-color);
&:last-child {
border-radius: 0 0 4px 4px;
}
&__content {

View file

@ -218,7 +218,7 @@
display: flex;
align-items: center;
justify-content: space-between;
border: 1px solid lighten($ui-base-color, 8%);
border: 1px solid var(--background-border-color);
border-radius: 4px;
padding: 15px;
text-decoration: none;