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

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

Browse Source 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
This commit is contained in:
David Yip
2017-09-09 23:56:21 -05:00
parent 3dff74eecf 90712d4293
commit 67ad453373
67 changed files with 698 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2716,22 +2716,6 @@ button.icon-button.active i.fa-retweet {
}
}
.media-spoiler__video {
align-items: center;
background: $base-overlay-background;
color: $primary-text-color;
cursor: pointer;
display: flex;
flex-direction: column;
border: 0;
width: 100%;
height: 100%;
justify-content: center;
position: relative;
text-align: center;
z-index: 100;
}
.media-spoiler__warning {
display: block;
font-size: 14px;
@@ -4302,6 +4286,9 @@ button.icon-button.active i.fa-retweet {
margin-left: -68px;
width: calc(100% + 80px);
}
border: 0;
display: block;
}
.media-spoiler-video-play-icon {