From 247ceed3f454e15ba19308241b1deed3c1a09df2 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 16 Aug 2017 13:40:12 +0200 Subject: [PATCH 1/4] escape quotation marks on whatsapp share links --- app/views/shared/_social_share.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb index de4935ab2..00d94ce5c 100644 --- a/app/views/shared/_social_share.html.erb +++ b/app/views/shared/_social_share.html.erb @@ -4,7 +4,7 @@ <% end %>
<%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %> -  <%= url %>" class="show-for-small-only" data-action="share/whatsapp/share"> <%= t("social.whatsapp") %> From 827e4702a978c5e03cc70e939293b0ec7c4f0160 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 16 Aug 2017 13:40:46 +0200 Subject: [PATCH 2/4] removes duplicated social share partial on legislation views --- .../annotations/_slim_version_chooser.html.erb | 2 +- app/views/legislation/annotations/show.html.erb | 2 +- app/views/legislation/questions/show.html.erb | 2 +- app/views/legislation/shared/_share_buttons.html.erb | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 app/views/legislation/shared/_share_buttons.html.erb diff --git a/app/views/legislation/annotations/_slim_version_chooser.html.erb b/app/views/legislation/annotations/_slim_version_chooser.html.erb index 32c689501..438c46c09 100644 --- a/app/views/legislation/annotations/_slim_version_chooser.html.erb +++ b/app/views/legislation/annotations/_slim_version_chooser.html.erb @@ -18,7 +18,7 @@
diff --git a/app/views/legislation/shared/_share_buttons.html.erb b/app/views/legislation/shared/_share_buttons.html.erb deleted file mode 100644 index 971402628..000000000 --- a/app/views/legislation/shared/_share_buttons.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -
- <%= social_share_button_tag("#{title} #{setting['twitter_hashtag']}") %> - <% if browser.device.mobile? %> - - - <%= t("social.whatsapp") %> - - <% end %> -
From decbd261bbe4f0bc4af542cce0e85125929ace49 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 16 Aug 2017 13:41:13 +0200 Subject: [PATCH 3/4] improves styles to whatsapp share icon --- app/assets/stylesheets/participation.scss | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 8af8071ea..b4a511c85 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -311,7 +311,8 @@ .polls-show, .debate-quiz, .budget-investment-show, -.draft-panels { +.draft-panels, +.debate-questions { p { word-wrap: break-word; @@ -328,10 +329,13 @@ .whatsapp::before { background-color: #43d854; color: #fff; - font-size: 1.7em; - margin-left: rem-calc(0.5); - padding: rem-calc(9.5) rem-calc(9.8); - vertical-align: rem-calc(10); + display: inline-block; + font-size: rem-calc(30); + height: rem-calc(48); + padding-top: rem-calc(9); + text-align: center; + vertical-align: top; + width: rem-calc(48); } .edit-debate, From 89452645ee1e8976b56624154b948dcaf86ccfff Mon Sep 17 00:00:00 2001 From: Bertocq Date: Thu, 17 Aug 2017 14:14:30 +0200 Subject: [PATCH 4/4] Use CGI.escape for whatsapp title sharing --- app/views/shared/_social_share.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_social_share.html.erb b/app/views/shared/_social_share.html.erb index 00d94ce5c..116e15ec1 100644 --- a/app/views/shared/_social_share.html.erb +++ b/app/views/shared/_social_share.html.erb @@ -4,7 +4,7 @@ <% end %>