From 5bc1fd23b0c2611ebc4fd3f61b85e29bdf16dba8 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 5 Jul 2019 19:35:36 +0530 Subject: [PATCH] Bump onebox version. - update HTML for twitter quoted onebox - updated CSS for twitter quoted onebox --- Gemfile | 2 +- Gemfile.lock | 4 +- .../stylesheets/common/base/onebox.scss | 38 +++++++++---------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index 8d2f0b7696d54..e469173995d40 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ gem 'redis-namespace' gem 'active_model_serializers', '~> 0.8.3' -gem 'onebox', '1.8.97' +gem 'onebox', '1.8.98' gem 'http_accept_language', '~>2.0.5', require: false diff --git a/Gemfile.lock b/Gemfile.lock index d257743be238a..14fdc28974a86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,7 +238,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - onebox (1.8.97) + onebox (1.8.98) htmlentities (~> 4.3) moneta (~> 1.0) multi_json (~> 1.11) @@ -487,7 +487,7 @@ DEPENDENCIES omniauth-oauth2 omniauth-openid omniauth-twitter - onebox (= 1.8.97) + onebox (= 1.8.98) openid-redis-store parallel_tests pg diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 922fb9b715686..65e6409143597 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -423,39 +423,37 @@ aside.onebox.twitterstatus .onebox-body { } p, .tweet { - white-space: pre-line; padding-top: 3px; margin-left: 70px; - .quoted-link { - display: inline; - text-decoration: none; - color: inherit; + .quoted { + border: 1px solid $primary-low; + padding: 0px 14px 0px 12px; + white-space: normal; + margin-top: 15px; - .quoted { - border: 1px solid $primary-low; - padding: 1px 25px 1px 12px; - white-space: normal; + .quoted-link { + color: inherit; + } - .quoted-title { - font-weight: bold; - margin: 5px 2px; + .quoted-title { + font-weight: bold; + margin: 5px 2px; - span { - font-weight: lighter; - color: $primary-medium; - } + span { + font-weight: lighter; + color: $primary-medium; } + } - div { - margin-bottom: 5px; - } + div { + margin-bottom: 5px; } } } .date { clear: left; - padding-top: 5px; + padding-top: 10px; } }