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

Merge commit '2f932cb2bb' into kb_migration

Browse source
This commit is contained in:
KMY 2023-08-03 15:48:07 +09:00
commit 82d61dad96
65 changed files with 909 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/javascript/styles/mastodon/accounts.scss
View file

@ -187,7 +187,6 @@
}
}
.account-role,
.information-badge,
.simple_form .recommended,
.simple_form .not_recommended,
@ -213,10 +212,30 @@
}
.account-role {
display: inline-flex;
padding: 4px;
padding-inline-end: 8px;
border: 1px solid $highlight-text-color;
color: $highlight-text-color;
font-weight: 500;
font-size: 12px;
letter-spacing: 0.5px;
line-height: 16px;
gap: 4px;
border-radius: 6px;
align-items: center;
.fa {
color: var(--user-role-accent, $highlight-text-color);
svg {
width: auto;
height: 15px;
opacity: 0.85;
fill: currentColor;
}
&__domain {
font-weight: 400;
opacity: 0.75;
letter-spacing: 0;
}
}

2
app/javascript/styles/mastodon/basics.scss
View file

@ -164,7 +164,7 @@ body {
a {
&:focus {
border-radius: 4px;
outline: $ui-button-icon-focus-outline;
outline: $ui-button-focus-outline;
}
&:focus:not(:focus-visible) {

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

@ -3343,6 +3343,8 @@ $ui-header-height: 55px;
text-decoration: none;
overflow: hidden;
white-space: nowrap;
border: 0;
border-left: 4px solid transparent;
&:hover,
&:focus,
@ -3354,6 +3356,11 @@ $ui-header-height: 55px;
outline: 0;
}
&:focus-visible {
border-color: $ui-button-focus-outline-color;
border-radius: 0;
}
&--transparent {
background: transparent;
color: $ui-secondary-color;
@ -3693,7 +3700,9 @@ a.status-card {
.status-card.expanded .status-card__title {
white-space: normal;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.status-card__content {
@ -3742,9 +3751,6 @@ a.status-card {
aspect-ratio: 1;
background: lighten($ui-base-color, 8%);
position: relative;
border-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
& > .fa {
font-size: 21px;
@ -3757,9 +3763,6 @@ a.status-card {
}
.status-card__image-image {
border-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
display: block;
margin: 0;
width: 100%;
@ -3771,9 +3774,6 @@ a.status-card {
}
.status-card__image-preview {
border-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
display: block;
margin: 0;
width: 100%;
@ -3800,6 +3800,15 @@ a.status-card {
aspect-ratio: auto;
}
.status-card__image,
.status-card__image-image,
.status-card__image-preview {
border-start-start-radius: 8px;
border-start-end-radius: 0;
border-end-end-radius: 0;
border-end-start-radius: 8px;
}
.status-card.expanded .status-card__image,
.status-card.expanded .status-card__image-image,
.status-card.expanded .status-card__image-preview {
@ -4017,7 +4026,7 @@ a.status-card {
}
&:focus-visible {
outline: $ui-button-icon-focus-outline;
outline: $ui-button-focus-outline;
}
&.active {

4
app/javascript/styles/mastodon/variables.scss
View file

@ -48,6 +48,8 @@ $ui-highlight-color: $classic-highlight-color !default;
$ui-button-color: $white !default;
$ui-button-background-color: $blurple-500 !default;
$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: $grey-100 !default;
$ui-button-secondary-border-color: $grey-100 !default;
@ -62,7 +64,7 @@ $ui-button-tertiary-focus-color: $white !default;
$ui-button-destructive-background-color: $red-500 !default;
$ui-button-destructive-focus-background-color: $red-600 !default;
$ui-button-icon-focus-outline: solid 2px $blurple-400 !default;
$ui-button-icon-focus-outline: $ui-button-focus-outline !default;
$ui-button-icon-hover-background-color: rgba(140, 141, 255, 40%) !default;
// Variables for texts