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

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-06-12 13:17:21 +00:00
parent 34f1fd2a62 6151308c47
commit 4d8d1fa129
58 changed files with 837 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4555,7 +4555,7 @@ a.status-card {
height: 100%;
z-index: 4;
border: 0;
background: $base-shadow-color;
background: $base-overlay-background;
color: $darker-text-color;
transition: none;
pointer-events: none;

6
app/javascript/styles/mastodon/emoji_picker.scss
View File

@ -62,16 +62,16 @@
}
.emoji-mart-anchor-bar {
bottom: 0;
bottom: -1px;
}
}
.emoji-mart-anchor-bar {
position: absolute;
bottom: -3px;
bottom: -5px;
left: 0;
width: 100%;
height: 3px;
height: 4px;
background-color: $highlight-text-color;
}

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

@ -1,6 +1,7 @@
.footer {
text-align: center;
margin-top: 30px;
padding-bottom: 60px;
font-size: 12px;
color: $darker-text-color;