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

Fix regressions from #2683 (#2970)

Browse Source 
* Fix regressions from #2683

Properly format spoiler text HTML, while keeping old logic for blankness intact
Process hashtags and mentions in spoiler text
Format spoiler text for Atom
Change "show more" toggle into a button instead of anchor
Fix style regression on dropdowns for detailed statuses

* Fix lint issue

* Convert spoiler text to plaintext in desktop notifications
This commit is contained in:
Eugen Rochko
2017-05-11 00:28:10 +02:00
committed by GitHub
parent 65027657ec
commit 72698bc3b4
14 changed files with 88 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/javascript/styles/components.scss
View File

@ -474,15 +474,18 @@
}
}
a.status__content__spoiler-link {
.status__content__spoiler-link {
display: inline-block;
border-radius: 2px;
background: transparent;
border: 0;
color: lighten($ui-base-color, 8%);
font-weight: 500;
font-size: 11px;
padding: 0 6px;
text-transform: uppercase;
line-height: inherit;
cursor: pointer;
}
.status__prepend-icon-wrapper {
@ -608,6 +611,34 @@ a.status__content__spoiler-link {
width: 18px;
}
.detailed-status__action-bar-dropdown {
flex: 1 1 auto;
display: flex;
align-items: center;
justify-content: center;
position: relative;
.dropdown {
display: block;
width: 18px;
height: 18px;
}
.dropdown--active {
.dropdown__content.dropdown__left {
left: 20px;
right: initial;
}
&::after {
bottom: initial;
margin-left: 7px;
margin-top: -7px;
right: initial;
}
}
}
.detailed-status {
background: lighten($ui-base-color, 4%);
padding: 14px 10px;
@ -2165,6 +2196,7 @@ button.icon-button.active i.fa-retweet {
display: flex;
flex: 1 1 auto;
align-items: center;
justify-content: center;
a {
color: $ui-highlight-color;