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

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-08 16:38:48 +09:00
commit 9e2390f3c9
57 changed files with 227 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -802,7 +802,8 @@ body > [data-popper-placement] {
vertical-align: middle;
object-fit: contain;
margin: -0.2ex 0.15em 0.2ex;
width: 16px;
min-width: 16px;
max-width: min(8em, 100%);
height: 16px;
img {
@ -878,7 +879,8 @@ body > [data-popper-placement] {
}
.emojione {
width: 20px;
min-width: 20px;
max-width: min(8em, 100%);
height: 20px;
margin: -3px 0 0;
}
@ -959,7 +961,8 @@ body > [data-popper-placement] {
overflow-y: auto;
.emojione {
width: 20px;
min-width: 20px;
max-width: min(8em, 100%);
height: 20px;
margin: -3px 0 0;
}
@ -1334,7 +1337,8 @@ body > [data-popper-placement] {
line-height: 24px;
.emojione {
width: 24px;
min-width: 24px;
max-width: min(8em, 100%);
height: 24px;
margin: -1px 0 0;
}
@ -4122,6 +4126,10 @@ a.status-card.compact:hover {
text-align: center;
}
.detailed-status__button .emoji-button {
padding: 0;
}
.column-settings__outer {
background: lighten($ui-base-color, 8%);
padding: 15px;
@ -5871,7 +5879,8 @@ a.status-card.compact:hover {
line-height: 24px;
.emojione {
width: 24px;
min-width: 24px;
max-width: min(8em, 100%);
height: 24px;
margin: -1px 0 0;
}
@ -7222,7 +7231,8 @@ noscript {
}
.emojione {
width: 22px;
min-width: 22px;
max-width: min(8em, 100%);
height: 22px;
}

5
app/javascript/styles/mastodon/emoji_picker.scss
View file

@ -166,6 +166,11 @@
.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;

7
app/javascript/styles/mastodon/rich_text.scss
View file

@ -85,6 +85,13 @@
sup {
vertical-align: super;
}
}
.status__content__text {
a.kmy-dangerous-link {
color: red !important;
}
}
.reply-indicator__content {

3
app/javascript/styles/mastodon/tables.scss
View file

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

3
app/javascript/styles/mastodon/widgets.scss
View file

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