Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gab-social
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
gab
social
gab-social
Commits
292991bf
Commit
292991bf
authored
Jan 16, 2020
by
mgabdev
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://code.gab.com/gab/social/gab-social
into develop
parents
8322dd3b
525937d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
app/javascript/styles/gabsocial/components.scss
app/javascript/styles/gabsocial/components.scss
+10
-0
lib/paperclip/gif_transcoder.rb
lib/paperclip/gif_transcoder.rb
+1
-1
No files found.
app/javascript/styles/gabsocial/components.scss
View file @
292991bf
...
...
@@ -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
;
...
...
lib/paperclip/gif_transcoder.rb
View file @
292991bf
...
...
@@ -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
>
1
000
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment