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

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2021-05-22 13:11:31 +02:00
parent 03952c7d49 92a9fcf0e1
commit 5f334807d2
55 changed files with 646 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/styles/mailer.scss
View File

@ -258,7 +258,6 @@ h5 {
padding: 16px;
line-height: 20px;
mso-line-height-rule: exactly;
border-radius: 4px;
text-align: center;
font-weight: 500;
font-size: 17px;

1
app/javascript/styles/mastodon/about.scss
View File

@ -322,7 +322,6 @@ $small-breakpoint: 960px;
font-family: $font-sans-serif, sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
line-height: 30px;
margin-bottom: 12px;
color: $darker-text-color;

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

@ -3611,7 +3611,6 @@ a.status-card.compact:hover {
span {
display: block;
float: left;
margin-left: 50%;
transform: translateX(-50%);
margin: 82px 0 0 50%;
white-space: nowrap;

1
app/javascript/styles/mastodon/widgets.scss
View File

@ -593,7 +593,6 @@ $fluid-breakpoint: $maximum-width + 20px;
display: block;
font-weight: 500;
padding: 15px;
overflow: hidden;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;