diff --git a/Gemfile b/Gemfile index 675e738b1..383de2122 100644 --- a/Gemfile +++ b/Gemfile @@ -59,6 +59,7 @@ gem 'tolk' # Web interface for translations gem 'browser' gem 'turnout' gem 'redcarpet' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 7323d578f..5fe0c1d3d 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index e272b9550..51044c3e2 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -48,4 +48,5 @@ + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 4db54078d..b0b156581 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index 33d2d4dee..edcc9bc61 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 822e4cd4c..68065e82a 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,4 +11,4 @@ @import "annotator.min"; @import "annotator_overrides"; @import "jquery-ui/datepicker"; -@import "datepicker_overrides"; \ No newline at end of file +@import "datepicker_overrides"; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index b13b09f46..2c06f745a 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -160,3 +160,6 @@ .icon-no-notification:before { content: "\78"; } +.icon-whatsapp:before { + content: "\50"; +} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index bc6aa3694..35c067445 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -337,6 +337,20 @@ .debate-show, .proposal-show { + .social-share-full .social-share-button{ + display:inline; + } + + .whatsapp:before{ + vertical-align: 10px; + margin-left: 0.5px; + color: white; + background-color: #43d854; + padding: 9.5px 9.8px 9.5px 9.8px; + font-size: 1.7em; + } + + .edit-debate, .edit-proposal { margin-bottom: 0; } diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 93ca49862..58d07fee4 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -54,8 +54,14 @@

<%= t("debates.show.share") %>

- <%= social_share_button_tag(@debate.title) %> - + <% end %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 3a7434d75..31b991f3c 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -86,7 +86,14 @@

<%= t("proposals.show.share") %>

- <%= social_share_button_tag(@proposal.title) %> +