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

bump onebox

This commit is contained in:
Arpit Jalan 2017-02-08 12:08:41 +05:30
parent 7c9f8cb245
commit 75f154b177
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile.lock
View File

@ -1,7 +1,6 @@
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.2)
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
@ -39,7 +38,6 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
afm (0.2.2)
annotate (2.7.1)
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 12.0)
@ -116,7 +114,6 @@ GEM
globalid (0.3.7)
activesupport (>= 4.1.0)
guess_html_encoding (0.0.11)
hashery (2.1.2)
hashie (3.4.6)
highline (1.7.8)
hiredis (0.6.1)
@ -209,24 +206,17 @@ GEM
omniauth-twitter (1.3.0)
omniauth-oauth (~> 1.1)
rack
onebox (1.8.0)
onebox (1.8.1)
fast_blank (>= 1.0.0)
htmlentities (~> 4.3.4)
moneta (~> 0.8)
multi_json (~> 1.11)
mustache
nokogiri (~> 1.6.6)
pdf-reader
sanitize
openid-redis-store (0.0.2)
redis
ruby-openid
pdf-reader (1.4.1)
Ascii85 (~> 1.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
pg (0.19.0)
progress (3.1.1)
pry (0.10.4)
@ -321,7 +311,6 @@ GEM
rspec-support (3.4.1)
rtlit (0.0.5)
ruby-openid (2.7.0)
ruby-rc4 (0.1.5)
ruby-readability (0.7.0)
guess_html_encoding (>= 0.0.4)
nokogiri (>= 1.6.0)
@ -375,7 +364,6 @@ GEM
tilt (2.0.5)
timecop (0.8.1)
trollop (2.1.2)
ttfunk (1.4.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.2)

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

@ -171,15 +171,6 @@ aside.onebox {
@include gdocs-logo('drive');
}
.pdf-onebox-logo {
width: 60px;
height: 50px;
float: left;
background: image-url("favicons/pdf_64px.png") no-repeat;
background-size: 48px 48px;
display: inline-block;
}
// Google Calendar Placeholder
.gdocs-onebox-splash {
background-color: blend-primary-secondary(30%);
@ -366,14 +357,29 @@ aside.onebox.stackexchange .onebox-body {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}
// mobile specific style
.mobile-view article.onebox-body {
border-top: none;
}
.onebox.xkcd .onebox-body {
img {
max-width: 100% !important;
float: none !important;
}
}
// pdf onebox
.onebox.pdf .onebox-body {
.pdf-onebox-logo {
width: 60px;
height: 50px;
float: left;
background: image-url("favicons/pdf_64px.png") no-repeat;
background-size: 48px 48px;
display: inline-block;
}
.filesize {
color: gray;
}
}
// mobile specific style
.mobile-view article.onebox-body {
border-top: none;
}