tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-08-22 18:50:14 +02:00
parent 245fe855be 1cb978bcc3
commit 10404aece8
22 changed files with 237 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/javascript/styles/mastodon/components.scss
View File

@ -1111,7 +1111,8 @@ body > [data-popper-placement] {
.audio-player,
.attachment-list,
.picture-in-picture-placeholder,
.status-card {
.status-card,
.hashtag-bar {
margin-inline-start: $thread-margin;
width: calc(100% - ($thread-margin));
}
@ -9256,3 +9257,26 @@ noscript {
}
}
}
.hashtag-bar {
margin-top: 16px;
display: flex;
flex-wrap: wrap;
font-size: 14px;
gap: 4px;
a {
display: inline-flex;
border-radius: 4px;
background: rgba($highlight-text-color, 0.2);
color: $highlight-text-color;
padding: 0.4em 0.6em;
text-decoration: none;
&:hover,
&:focus,
&:active {
background: rgba($highlight-text-color, 0.3);
}
}
}