Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5595 from discourse/new-gfycat-onebox 

New gfycat onebox
This commit is contained in:
Rafael dos Santos Silva 2018-02-14 19:03:28 -02:00 committed by GitHub
parent b4aa0b096e c3606fdef6
commit 218c8e8623
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -36,7 +36,7 @@ gem 'redis-namespace'
gem 'active_model_serializers', '~> 0.8.3' gem 'active_model_serializers', '~> 0.8.3'
gem 'onebox', '1.8.36' gem 'onebox', '1.8.38'
gem 'http_accept_language', '~>2.0.5', require: false gem 'http_accept_language', '~>2.0.5', require: false

4
Gemfile.lock
View File

@ -232,7 +232,7 @@ GEM
omniauth-twitter (1.3.0) omniauth-twitter (1.3.0)
omniauth-oauth (~> 1.1) omniauth-oauth (~> 1.1)
rack rack
onebox (1.8.36) onebox (1.8.38)
fast_blank (>= 1.0.0) fast_blank (>= 1.0.0)
htmlentities (~> 4.3) htmlentities (~> 4.3)
moneta (~> 1.0) moneta (~> 1.0)
@ -469,7 +469,7 @@ DEPENDENCIES
omniauth-oauth2 omniauth-oauth2
omniauth-openid omniauth-openid
omniauth-twitter omniauth-twitter
onebox (= 1.8.36) onebox (= 1.8.38)
openid-redis-store openid-redis-store
pg (~> 0.21.0) pg (~> 0.21.0)
pry-nav pry-nav

20
app/assets/stylesheets/common/base/onebox.scss
View File

@ -463,10 +463,22 @@ aside.onebox.stackexchange .onebox-body {
.label2 { .label2 {
float: right; float: right;
} }
.site-icon { }
width: 16px;
height: 16px; .onebox {
margin-right: 3px; &.whitelistedgeneric,
&.gfycat {
.site-icon {
width: 16px;
height: 16px;
margin-right: 3px;
}
}
}
.onebox.gfycat p {
span.label1 a {
white-space: nowrap;
} }
} }