Skip to content

Commit

Permalink
Merge e34ad25 into 0561eae
Browse files Browse the repository at this point in the history
  • Loading branch information
Iepoev committed Jul 21, 2015
2 parents 0561eae + e34ad25 commit 7d7d8a9
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ gem 'select2-rails'
# Typeahead
gem 'twitter-typeahead-rails'

# social media buttons
gem 'shareable'

group :development do
gem 'rails-erd'

Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ GEM
rdoc (~> 4.0)
select2-rails (3.5.9.3)
thor (~> 0.14)
shareable (1.1.4)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
simple_form (3.1.0)
actionpack (~> 4.0)
activemodel (~> 4.0)
Expand Down Expand Up @@ -367,6 +370,7 @@ DEPENDENCIES
sass-rails (~> 4.0)
sdoc
select2-rails
shareable
simple_form
simple_token_authentication
spreadsheet
Expand All @@ -379,3 +383,6 @@ DEPENDENCIES
whenever
will_paginate (~> 3.0)
will_paginate-bootstrap

BUNDLED WITH
1.10.5
11 changes: 11 additions & 0 deletions app/assets/stylesheets/event.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,14 @@
overflow: hidden;
}
}

/* css for social media buttons, from https://github.com/hermango/shareable */
nav.share {display:inline-block;} /* shareable's nav tag */
nav.share div {float:left;}
nav.share iframe {border:0; margin-top:0; padding-top:0;} /* if using medium sized buttons */
#___plusone_0 {font-size: default !important;}
.fb_iframe_widget span { vertical-align: top; }
.fb_edge_widget_with_comment { vertical-align: top;}
.fb-like{display:inline-block}
* html .fb-like{display:inline}/* ie6 inline block fix*/
*+html .fb-like{display:inline}/* ie7 inline block fix*/
4 changes: 4 additions & 0 deletions app/views/events/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
<th>Contact e-mail</th>
<td><%= mail_to @event.contact_email, @event.contact_email %></td>
</tr>
<tr>
<th>Share this event</th>
<td><%= render_shareable :buttons=> ['twitter', 'facebook', 'google_plus'] %></td>
</tr>
</table>

<% unless @event.access_levels.blank? %>
Expand Down

0 comments on commit 7d7d8a9

Please sign in to comment.