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

Merge pull request #553 from ThibG/glitch-soc/merge-upstream

Browse Source 
Merge upstream changes
This commit is contained in:
ThibG
2018-06-24 15:27:51 +02:00
committed by GitHub
parent f364a27922 4b0f27ba78
commit c18d55e8c2
6 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/controllers/remote_unfollows.rb → app/controllers/remote_unfollows_controller.rb
View File

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

@@ -302,12 +302,10 @@
height: 0;
transform-origin: bottom;
opacity: 0.0;
transition: all 0.4s ease;
&.spoiler-input--visible {
height: 47px;
opacity: 1.0;
transition: all 0.4s ease;
}
}
@@ -568,6 +566,10 @@
}
}
.no-reduce-motion .spoiler-input {
transition: height 0.4s ease, opacity 0.4s ease;
}
.emojione {
font-size: inherit;
vertical-align: middle;

5
app/models/concerns/attachmentable.rb
View File

@@ -42,8 +42,9 @@ module Attachmentable
extensions_for_mime_type = mime_type.empty? ? [] : mime_type.first.extensions
original_extension = Paperclip::Interpolations.extension(attachment, :original)
proper_extension = extensions_for_mime_type.first.to_s
proper_extension = 'jpeg' if proper_extension == 'jpe'
extension = extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
extension = 'jpeg' if extension == 'jpe'
extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension
extension
end
end