Merge pull request #1171 from consul/update-gemfile

Updates Gemfile

Gemfile

@@ -37,7 +37,7 @@ gem 'acts_as_votable'
 gem 'ckeditor', '~> 4.1.5'
 gem 'invisible_captcha', '~> 0.8.2'
 gem 'cancancan'
-gem 'social-share-button', git: 'https://github.com/huacnlee/social-share-button.git', ref: 'e46a6a3e82b86023bc'
+gem 'social-share-button'
 gem 'initialjs-rails', '0.2.0.1'
 gem 'unicorn', '~> 5.1.0'
 gem 'paranoia'

Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-  remote: https://github.com/huacnlee/social-share-button.git
-  revision: e46a6a3e82b86023bc43b72c9379d3c6afe36b6b
-  ref: e46a6a3e82b86023bc
-  specs:
-    social-share-button (0.1.9)
-      coffee-rails
-      sass-rails
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -374,6 +365,9 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    social-share-button (0.3.1)
+      coffee-rails
+      sass-rails
     spring (1.7.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -495,7 +489,7 @@ DEPENDENCIES
   rspec-rails (~> 3.3)
   sass-rails (~> 5.0, >= 5.0.4)
   savon
-  social-share-button!
+  social-share-button
   spring
   spring-commands-rspec
   tolk

app/assets/stylesheets/layout.scss

@@ -1085,12 +1085,13 @@ table {
   }
 }
 
-.social-share-button-twitter {
+.ssb-twitter {
   background: #45B0E3;
+  background-image: none !important;
   color: white;
-  height: $line-height*2;
+  height: $line-height*2 !important;
   position: relative;
-  width: $line-height*2;
+  width: $line-height*2 !important;
 
   &:before {
     content: "f";
@@ -1124,12 +1125,13 @@ table {
   }
 }
 
-.social-share-button-facebook {
+.ssb-facebook {
   background: #3B5998;
+  background-image: none !important;
   color: white;
-  height: rem-calc(48);
+  height: rem-calc(48) !important;
   position: relative;
-  width: rem-calc(48);
+  width: rem-calc(48) !important;
 
   &:before {
     content: "A";
@@ -1163,12 +1165,13 @@ table {
   }
 }
 
-.social-share-button-google_plus {
+.ssb-google_plus {
   background: #DE4C34;
+  background-image: none !important;
   color: white;
-  height: $line-height*2;
+  height: $line-height*2 !important;
   position: relative;
-  width: $line-height*2;
+  width: $line-height*2 !important;
 
   &:before {
     content: "B";
@@ -1206,7 +1209,7 @@ table {
     display: inline-block;
   }
 
-  .social-share-button-twitter {
+  .ssb-twitter {
     background: none;
     color: white;
     height: $line-height;
@@ -1229,7 +1232,7 @@ table {
     }
   }
 
-  .social-share-button-facebook {
+  .ssb-facebook {
     background: none;
     color: white;
     height: rem-calc(24);
@@ -1252,7 +1255,7 @@ table {
     }
   }
 
-  .social-share-button-google_plus {
+  .ssb-google_plus {
     background: none;
     color: white;
     height: rem-calc(24);

app/assets/stylesheets/participation.scss

@@ -900,9 +900,9 @@
 
     .share-supported {
 
-      .social-share-button-twitter,
-      .social-share-button-facebook,
-      .social-share-button-google_plus {
+      .ssb-twitter,
+      .ssb-facebook,
+      .ssb-google_plus {
         color: $budget;
       }
     }
@@ -1016,9 +1016,9 @@
 
     .share-supported {
 
-      .social-share-button-twitter,
-      .social-share-button-facebook,
-      .social-share-button-google_plus {
+      .ssb-twitter,
+      .ssb-facebook,
+      .ssb-google_plus {
         height: rem-calc(33);
 
         &:before {