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

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

Browse source
This commit is contained in:
KMY 2024-12-16 10:14:31 +09:00
commit 3784ad273c
555 changed files with 7564 additions and 3363 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@
&:disabled,
&.disabled {
background-color: $ui-primary-color;
background-color: $ui-button-disabled-color;
cursor: not-allowed;
}
@ -148,14 +148,14 @@
&:disabled,
&.disabled {
opacity: 0.7;
border-color: $ui-primary-color;
color: $ui-primary-color;
border-color: $ui-button-disabled-color;
color: $ui-button-disabled-color;
&:active,
&:focus,
&:hover {
border-color: $ui-primary-color;
color: $ui-primary-color;
border-color: $ui-button-disabled-color;
color: $ui-button-disabled-color;
}
}
}
@ -2030,6 +2030,8 @@ body > [data-popper-placement] {
}
&__handle {
overflow: hidden;
text-overflow: ellipsis;
user-select: all;
}
}
@ -3111,7 +3113,9 @@ $ui-header-logo-wordmark-width: 99px;
.column > .scrollable,
.tabs-bar__wrapper .column-header,
.tabs-bar__wrapper .column-back-button {
.tabs-bar__wrapper .column-back-button,
.explore__search-header,
.column-search-header {
border-left: 0;
border-right: 0;
}
@ -3154,10 +3158,6 @@ $ui-header-logo-wordmark-width: 99px;
}
}
.explore__search-header {
display: none;
}
.explore__suggestions__card {
padding: 12px 16px;
gap: 8px;
@ -3231,10 +3231,6 @@ $ui-header-logo-wordmark-width: 99px;
.columns-area__panels__pane--compositional {
display: none;
}
.explore__search-header {
display: flex;
}
}
.icon-with-badge {
@ -5728,6 +5724,17 @@ a.status-card {
}
.search__icon {
background: transparent;
border: 0;
padding: 0;
position: absolute;
top: 12px + 2px;
cursor: default;
pointer-events: none;
margin-inline-start: 16px - 2px;
width: 20px;
height: 20px;
&::-moz-focus-inner {
border: 0;
}
@ -5739,17 +5746,14 @@ a.status-card {
.icon {
position: absolute;
top: 12px + 2px;
display: inline-block;
top: 0;
inset-inline-start: 0;
opacity: 0;
transition: all 100ms linear;
transition-property: transform, opacity;
width: 20px;
height: 20px;
color: $darker-text-color;
cursor: default;
pointer-events: none;
margin-inline-start: 16px - 2px;
&.active {
pointer-events: auto;
@ -8358,6 +8362,8 @@ noscript {
text-overflow: ellipsis;
span {
overflow: hidden;
text-overflow: ellipsis;
user-select: all;
}
@ -9085,10 +9091,13 @@ noscript {
}
.explore__search-header {
background: darken($ui-base-color, 4%);
justify-content: center;
align-items: center;
padding: 15px;
border: 1px solid var(--background-border-color);
border-top: 0;
border-bottom: 0;
padding: 16px;
padding-bottom: 8px;
.search {
width: 100%;
@ -9097,7 +9106,7 @@ noscript {
.search__input {
border: 1px solid var(--background-border-color);
padding: 10px;
padding: 12px;
padding-inline-end: 30px;
}
@ -9105,13 +9114,21 @@ noscript {
border: 1px solid var(--background-border-color);
}
.search .icon {
top: 9px;
inset-inline-end: 10px;
.search__icon {
top: 12px;
inset-inline-end: 12px;
color: $dark-text-color;
}
}
.layout-single-column .explore__search-header {
display: none;
@media screen and (max-width: $no-gap-breakpoint - 1px) {
display: flex;
}
}
.explore__search-results {
flex: 1 1 auto;
display: flex;