Revert "Upstream 20240517"

This commit is contained in:
KMY(雪あすか) 2024-05-24 08:15:12 +09:00 committed by GitHub
parent 9c006fd893
commit f6dec44e95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2347 changed files with 26470 additions and 87494 deletions

View file

@ -15,14 +15,13 @@
outline: 0;
box-sizing: border-box;
width: 100%;
border: 0;
box-shadow: none;
font-family: inherit;
background: $ui-base-color;
color: $darker-text-color;
border-radius: 4px;
border: 1px solid lighten($ui-base-color, 8%);
font-size: 17px;
line-height: normal;
font-size: 14px;
margin: 0;
}

View file

@ -26,7 +26,7 @@ $fluid-breakpoint: $maximum-width + 20px;
li {
position: relative;
border-bottom: 1px solid var(--background-border-color);
border-bottom: 1px solid lighten($ui-base-color, 8%);
padding: 1em 1.75em;
padding-inline-start: 3em;
font-weight: 500;
@ -53,24 +53,4 @@ $fluid-breakpoint: $maximum-width + 20px;
border-bottom: 0;
}
}
&__hint {
font-size: 14px;
font-weight: 400;
color: $darker-text-color;
}
.capability-icon {
svg {
transform: translateY(4px);
}
&.enabled {
color: green;
}
&.disabled {
color: red;
}
}
}

View file

@ -190,8 +190,7 @@
.information-badge,
.simple_form .overridden,
.simple_form .recommended,
.simple_form .not_recommended,
.simple_form .kmyblue {
.simple_form .not_recommended {
display: inline-block;
padding: 4px 6px;
cursor: default;
@ -255,12 +254,6 @@
border-color: rgba(lighten($error-red, 12%), 0.5);
}
.simple_form .kmyblue {
color: lighten($kmyblue, 12%);
background-color: rgba(lighten($kmyblue, 12%), 0.1);
border-color: rgba(lighten($kmyblue, 12%), 0.5);
}
.account__header__fields {
max-width: 100vw;
padding: 0;
@ -407,14 +400,3 @@
color: $gold-star;
}
}
.batch-table__row--attention .media-attachments-table {
.image {
max-width: 80%;
max-height: 200px;
}
.detailed-status__meta {
margin-top: 8px;
}
}

View file

@ -10,13 +10,6 @@ $content-width: 840px;
width: 100%;
min-height: 100vh;
.icon {
width: 16px;
height: 16px;
vertical-align: middle;
margin: 0 2px;
}
.sidebar-wrapper {
min-height: 100vh;
overflow: hidden;
@ -331,23 +324,6 @@ $content-width: 840px;
padding-bottom: 0;
margin-bottom: 0;
border-bottom: 0;
.comment {
display: block;
overflow: hidden;
text-overflow: ellipsis;
margin-top: 4px;
&.private-comment {
display: block;
color: $darker-text-color;
}
&.public-comment {
display: block;
color: $secondary-text-color;
}
}
}
& > p {
@ -646,6 +622,16 @@ body,
input.button {
margin: 0 5px 5px 0;
}
.media-spoiler-toggle-buttons {
margin-inline-start: auto;
.button {
overflow: visible;
margin: 0 0 5px 5px;
float: right;
}
}
}
.back-link {
@ -1068,7 +1054,6 @@ a.name-tag,
display: flex;
justify-content: space-between;
margin-bottom: 0;
word-break: break-word;
}
&__permissions {
@ -1076,13 +1061,6 @@ a.name-tag,
margin-bottom: 10px;
}
.listname {
color: $dark-text-color;
font-weight: bold;
font-size: 14px;
margin-left: 16px;
}
.expiration {
font-size: 13px;
}
@ -1336,9 +1314,6 @@ a.sparkline {
&__label {
padding: 15px;
display: flex;
gap: 8px;
align-items: center;
}
&__rules {
@ -1349,9 +1324,6 @@ a.sparkline {
&__rule {
cursor: pointer;
padding: 15px;
display: flex;
gap: 8px;
align-items: center;
}
}
@ -1392,21 +1364,8 @@ a.sparkline {
}
.account-card {
background: $ui-base-color;
border-radius: 4px;
border: 1px solid lighten($ui-base-color, 8%);
position: relative;
&__warning-badge {
position: absolute;
padding: 4px 10px;
top: 10px;
inset-inline-start: 10px;
border-radius: 4px;
background:
url('../images/warning-stripes.svg') repeat-y left,
url('../images/warning-stripes.svg') repeat-y right,
var(--background-color);
}
&__permalink {
color: inherit;

View file

@ -8,7 +8,7 @@
body {
font-family: $font-sans-serif, sans-serif;
background: var(--background-color);
background: darken($ui-base-color, 7%);
font-size: 13px;
line-height: 18px;
font-weight: 400;

File diff suppressed because it is too large Load diff

View file

@ -40,12 +40,13 @@
.compose-form {
width: 400px;
margin: 0 auto;
padding: 10px 0;
padding-bottom: 20px;
padding: 20px 0;
margin-top: 40px;
box-sizing: border-box;
@media screen and (width <= 400px) {
width: 100%;
margin-top: 0;
padding: 20px;
}
}
@ -55,15 +56,13 @@
width: 400px;
margin: 0 auto;
display: flex;
align-items: center;
gap: 10px;
font-size: 14px;
line-height: 20px;
font-size: 13px;
line-height: 18px;
box-sizing: border-box;
padding: 20px 0;
margin-top: 40px;
margin-bottom: 10px;
border-bottom: 1px solid lighten($ui-base-color, 8%);
border-bottom: 1px solid $ui-base-color;
@media screen and (width <= 440px) {
width: 100%;
@ -72,9 +71,9 @@
}
.avatar {
width: 48px;
height: 48px;
flex: 0 0 auto;
width: 40px;
height: 40px;
margin-inline-end: 10px;
img {
width: 100%;
@ -88,14 +87,13 @@
.name {
flex: 1 1 auto;
color: $secondary-text-color;
width: calc(100% - 90px);
.username {
display: block;
font-size: 16px;
line-height: 24px;
font-weight: 500;
text-overflow: ellipsis;
overflow: hidden;
color: $primary-text-color;
}
}
@ -103,62 +101,6 @@
display: block;
font-size: 32px;
line-height: 40px;
flex: 0 0 auto;
}
}
.redirect {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh;
font-size: 14px;
line-height: 18px;
&__logo {
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 30px;
img {
height: 48px;
}
}
&__message {
text-align: center;
h1 {
font-size: 17px;
line-height: 22px;
font-weight: 700;
margin-bottom: 30px;
}
p {
margin-bottom: 30px;
&:last-child {
margin-bottom: 0;
}
}
a {
color: $highlight-text-color;
font-weight: 500;
text-decoration: none;
&:hover,
&:focus,
&:active {
text-decoration: underline;
}
}
}
&__link {
margin-top: 15px;
margin-inline-start: 10px;
}
}

View file

@ -1,6 +1,7 @@
.emoji-mart {
font-size: 13px;
display: inline-block;
color: $inverted-text-color;
&,
* {
@ -14,8 +15,20 @@
}
.emoji-mart-bar {
border: 0 solid darken($ui-secondary-color, 8%);
&:first-child {
background: var(--dropdown-border-color);
border-bottom-width: 1px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
background: $ui-secondary-color;
}
&:last-child {
border-top-width: 1px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
display: none;
}
}
@ -23,6 +36,7 @@
display: flex;
justify-content: space-between;
padding: 0 6px;
color: $lighter-text-color;
line-height: 0;
}
@ -36,10 +50,9 @@
cursor: pointer;
background: transparent;
border: 0;
color: $darker-text-color;
&:hover {
color: lighten($darker-text-color, 4%);
color: darken($lighter-text-color, 4%);
}
}
@ -47,7 +60,7 @@
color: $highlight-text-color;
&:hover {
color: lighten($highlight-text-color, 4%);
color: darken($highlight-text-color, 4%);
}
.emoji-mart-anchor-bar {
@ -82,6 +95,7 @@
height: 270px;
max-height: 35vh;
padding: 0 6px 6px;
background: $simple-background-color;
will-change: transform;
&::-webkit-scrollbar-track:hover,
@ -93,6 +107,7 @@
.emoji-mart-search {
padding: 10px;
padding-inline-end: 45px;
background: $simple-background-color;
position: relative;
input {
@ -103,20 +118,19 @@
font-family: inherit;
display: block;
width: 100%;
background: $ui-base-color;
color: $darker-text-color;
border: 1px solid lighten($ui-base-color, 8%);
background: rgba($ui-secondary-color, 0.3);
color: $inverted-text-color;
border: 1px solid $ui-secondary-color;
border-radius: 4px;
&::-moz-focus-inner {
border: 0;
}
&:active,
&:focus {
outline: none !important;
border-width: 1px !important;
border-color: $ui-button-background-color;
&::-moz-focus-inner,
&:focus,
&:active {
outline: 0 !important;
}
&::-webkit-search-cancel-button {
@ -141,21 +155,17 @@
&:disabled {
cursor: default;
pointer-events: none;
opacity: 0.3;
}
svg {
fill: $darker-text-color;
fill: $action-button-color;
}
}
.emoji-mart-category .emoji-mart-emoji {
cursor: pointer;
&.emoji-mart-emoji-custom img {
width: auto !important;
min-width: 22px;
}
span {
z-index: 1;
position: relative;
@ -170,7 +180,7 @@
inset-inline-start: 0;
width: 100%;
height: 100%;
background-color: var(--dropdown-border-color);
background-color: rgba($ui-secondary-color, 0.7);
border-radius: 100%;
}
}
@ -187,6 +197,7 @@
width: 100%;
font-weight: 500;
padding: 5px 6px;
background: $simple-background-color;
}
}
@ -230,7 +241,7 @@
.emoji-mart-no-results {
font-size: 14px;
color: $dark-text-color;
color: $light-text-color;
text-align: center;
padding: 5px 6px;
padding-top: 70px;

View file

@ -111,30 +111,18 @@ code {
margin-top: -2px;
}
}
.kmyblue {
position: absolute;
margin: 0 4px;
margin-top: -2px;
}
}
.row {
display: flex;
margin: 0 -5px;
.input,
.fields-label {
.input {
box-sizing: border-box;
flex: 1 1 auto;
width: 50%;
padding: 0 5px;
}
.fields-label {
font-weight: bold;
margin-left: 12px;
}
}
.title {
@ -1090,7 +1078,6 @@ code {
&__type {
color: $darker-text-color;
word-break: break-word;
}
}
@ -1146,10 +1133,6 @@ code {
margin-top: 10px;
white-space: nowrap;
}
.template-row {
display: none;
}
}
.progress-tracker {
@ -1329,12 +1312,6 @@ code {
font-weight: 600;
}
.hint {
display: block;
font-size: 14px;
color: $darker-text-color;
}
.recommended {
position: absolute;
margin: 0 4px;

View file

@ -1,5 +1,5 @@
.modal-layout {
background: darken($ui-base-color, 4%)
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-lighter-color)}33"/></svg>')
repeat-x bottom fixed;
display: flex;

View file

@ -52,8 +52,6 @@
&__option {
position: relative;
display: flex;
align-items: flex-start;
gap: 8px;
padding: 6px 0;
line-height: 18px;
cursor: default;
@ -80,22 +78,16 @@
box-sizing: border-box;
width: 100%;
font-size: 14px;
color: $secondary-text-color;
color: $inverted-text-color;
outline: 0;
font-family: inherit;
background: $ui-base-color;
border: 1px solid $darker-text-color;
background: $simple-background-color;
border: 1px solid darken($simple-background-color, 14%);
border-radius: 4px;
padding: 8px 12px;
padding: 6px 10px;
&:focus {
border-color: $ui-highlight-color;
}
@media screen and (width <= 600px) {
font-size: 16px;
line-height: 24px;
letter-spacing: 0.5px;
border-color: $highlight-text-color;
}
}
@ -104,20 +96,26 @@
}
&.editable {
display: flex;
align-items: center;
overflow: visible;
}
}
&__input {
display: block;
display: inline-block;
position: relative;
border: 1px solid $ui-primary-color;
box-sizing: border-box;
width: 17px;
height: 17px;
width: 18px;
height: 18px;
margin-inline-end: 10px;
top: -1px;
border-radius: 50%;
flex: 0 0 auto;
vertical-align: middle;
margin-top: auto;
margin-bottom: auto;
flex: 0 0 18px;
&.checkbox {
border-radius: 4px;
@ -161,15 +159,6 @@
}
}
&__option.editable &__input {
&:active,
&:focus,
&:hover {
border-color: $ui-primary-color;
border-width: 1px;
}
}
&__number {
display: inline-block;
width: 45px;
@ -220,6 +209,90 @@
}
}
.compose-form__poll-wrapper {
border-top: 1px solid darken($simple-background-color, 8%);
ul {
padding: 10px;
}
.poll__input {
&:active,
&:focus,
&:hover {
border-color: $ui-button-focus-background-color;
}
}
.poll__footer {
border-top: 1px solid darken($simple-background-color, 8%);
padding: 10px;
display: flex;
align-items: center;
button,
select {
flex: 1 1 50%;
&:focus {
border-color: $highlight-text-color;
}
}
}
.button.button-secondary {
font-size: 14px;
font-weight: 400;
padding: 6px 10px;
height: auto;
line-height: inherit;
color: $action-button-color;
border-color: $action-button-color;
margin-inline-end: 5px;
&:hover,
&:focus,
&.active {
border-color: $action-button-color;
background-color: $action-button-color;
color: $ui-button-color;
}
}
li {
display: flex;
align-items: center;
.poll__option {
flex: 0 0 auto;
width: calc(100% - (23px + 6px));
margin-inline-end: 6px;
}
}
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;
}
.icon-button.disabled {
color: darken($simple-background-color, 14%);
}
}
.muted .poll {
color: $dark-text-color;

View file

@ -1,7 +1,5 @@
.account__header__bio,
.status__content__text,
.e-content,
.edit-indicator__content,
.reply-indicator__content {
pre,
blockquote {
@ -14,32 +12,6 @@
}
}
code,
pre {
font-family: monospace;
}
code {
margin: 0 8px;
}
pre {
padding: 4px 8px;
span.ellipsis::after {
content: '';
}
span.invisible {
display: inline;
font-size: inherit;
line-height: inherit;
width: inherit;
height: inherit;
position: static;
}
}
blockquote {
padding-inline-start: 10px;
border-inline-start: 3px solid $darker-text-color;
@ -82,22 +54,11 @@
ol {
list-style-type: decimal;
}
sup {
vertical-align: super;
}
.emojione {
transition: transform 0.2s ease;
&:hover {
transform: scale(1.2);
}
}
}
.status__content__text {
a.kmy-dangerous-link {
color: red !important;
.reply-indicator__content {
blockquote {
border-left-color: $inverted-text-color;
color: $inverted-text-color;
}
}

View file

@ -304,8 +304,7 @@ a.table-action-link {
margin-inline-end: 10px;
.emojione {
min-width: 32px;
max-width: min(10em, 100%);
width: 32px;
height: 32px;
}
}

View file

@ -14,7 +14,6 @@ $success-green: #79bd9a !default; // Padua
$error-red: $red-500 !default; // Cerise
$warning-red: #ff5050 !default; // Sunset Orange
$gold-star: #ca8f04 !default; // Dark Goldenrod
$kmyblue: #29a5f7 !default;
$red-bookmark: $warning-red;
@ -24,10 +23,6 @@ $classic-primary-color: #9baec8; // Echo Blue
$classic-secondary-color: #d9e1e8; // Pattens Blue
$classic-highlight-color: #6364ff; // Brand purple
// Values for kmyblue original functions
$emoji-reaction-color: #42485a !default;
$emoji-reaction-selected-color: #617ed5 !default;
// Variables for defaults in UI
$base-shadow-color: $black !default;
$base-overlay-background: $black !default;
@ -51,10 +46,10 @@ $ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-secondary-color: $blurple-500 !default;
$ui-button-secondary-border-color: $blurple-500 !default;
$ui-button-secondary-focus-border-color: $blurple-300 !default;
$ui-button-secondary-focus-color: $blurple-300 !default;
$ui-button-secondary-color: $grey-100 !default;
$ui-button-secondary-border-color: $grey-100 !default;
$ui-button-secondary-focus-background-color: $grey-600 !default;
$ui-button-secondary-focus-color: $white !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
@ -99,16 +94,10 @@ $font-display: 'mastodon-font-display' !default;
$font-monospace: 'mastodon-font-monospace' !default;
:root {
--dropdown-border-color: #{lighten($ui-base-color, 4%)};
--dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
--dropdown-border-color: #{lighten($ui-base-color, 12%)};
--dropdown-background-color: #{lighten($ui-base-color, 4%)};
--dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
--modal-background-color: #{rgba(darken($ui-base-color, 8%), 0.7)};
--modal-background-variant-color: #{rgba($ui-base-color, 0.7)};
--modal-background-color: #{darken($ui-base-color, 4%)};
--modal-border-color: #{lighten($ui-base-color, 4%)};
--background-border-color: #{lighten($ui-base-color, 4%)};
--background-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
--background-color: #{darken($ui-base-color, 8%)};
--background-color-tint: #{rgba(darken($ui-base-color, 8%), 0.9)};
--surface-background-color: #{darken($ui-base-color, 4%)};
}

View file

@ -36,8 +36,7 @@
font-weight: 400;
.emojione {
min-width: 20px;
max-width: min(10em, 100%);
width: 20px;
height: 20px;
margin: -3px 0 0;
margin-inline-start: 0.075em;