Commit 292991bf authored by mgabdev's avatar mgabdev

Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

parents 8322dd3b 525937d5
......@@ -1211,6 +1211,11 @@ a.account__display-name {
font-size: 14px;
}
// Hide "verified" emoji to avoid confusion
.display-name .emojione[alt=":verified:"] {
display: none;
}
.status__relative-time,
.detailed-status__datetime {
&:hover {
......@@ -5029,6 +5034,11 @@ noscript {
height: 22px;
}
// Hide "verified" emoji to avoid confusion
.emojione[alt=":verified:"] {
display: none;
}
h1 {
span:first-of-type {
font-size: 20px !important;
......
......@@ -20,7 +20,7 @@ module Paperclip
def needs_convert?
num_frames = identify('-format %n :file', file: file.path).to_i
options[:style] == :original && num_frames > 1
options[:style] == :original && num_frames > 1000
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment