Merge branch 'master' into flat

Conflicts:
	contrib/css/github.css
	social-likes.css

Contributing.md

@@ -53,6 +53,7 @@ function foo(bar, fum) {
 
 - If you have commit access to repo and want to make big change or not sure about something, make a new branch and open pull request.
 - Don’t commit generated files: compiled from Stylus CSS, minified JavaScript, etc.
+- Don’t change version number and changelog.
 - Install [EditorConfig](http://editorconfig.org/) plugin for your code editor.
 - If code you change uses different style (probably it’s an old code) use file’s style instead of style described on this page.
 - Feel free to [ask me](http://sapegin.me/contacts) anything you need.

Readme.md

@@ -1,5 +1,8 @@
 # Social Likes
 
+[![Bower version](https://badge.fury.io/bo/social-likes.png)](http://badge.fury.io/bo/social-likes)
+[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
+
 Beautiful “like” buttons with counters for popular social networks: Facebook, Twitter, LiveJournal, etc. Uses jQuery.
 
 
@@ -208,9 +211,11 @@ And use in like any other button:
 See sources (`src` folder) for available options and class names and `contrib` folder for custom buttons examples.
 
 
-### Title, description and image for Facebok and Twitter
+### How to change title, description and image
 
-You can add they using [Facebook Open Graph](http://davidwalsh.name/facebook-meta-tags) and [Twitter Card](https://dev.twitter.com/docs/cards):
+You can use [Open Graph](http://ogp.me/). It works for [Facebook](http://davidwalsh.name/facebook-meta-tags), Twitter, [Google+](https://developers.google.com/+/web/snippet/), [Pinterest](http://developers.pinterest.com/rich_pins/) and [Vkontakte](http://vk.com/dev/widget_like)). 
+
+You can add additional Twitter data using [Twitter Card](https://dev.twitter.com/docs/cards).
 
 ```html
 <meta property="og:type" content="article">
@@ -223,7 +228,6 @@ You can add they using [Facebook Open Graph](http://davidwalsh.name/facebook-met
 <meta name="twitter:creator" content="@sapegin">
 ```
 
-`og:url`, `og:title`, `og:description`, `og:image` [should](http://vk.com/dev/widget_like) also work for Vkontakte.
 
 ### How to use Social Likes with Wordpress, etc.
 
@@ -231,6 +235,11 @@ See [wiki](https://github.com/sapegin/social-likes/wiki/How-to-use-Social-Likes-
 
 ## Release History
 
+### 2013-12-23 v2.0.13
+
+* `searchUrl` option (by [@pivchanskiy](https://github.com/pivchanskiy)).
+* Imporove `socialLikesButtons` object handling (by [@ironlion](https://github.com/ironlion)).
+
 ### 2013-08-26 v2.0.12
 
 * Icons only mode (by [@albburtsev](https://github.com/albburtsev)).

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "social-likes",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "main": ["./social-likes.min.js", "./social-likes.css"],
   "dependencies": {
     "jquery": ">=1.7"

contrib/css/github.css

@@ -6,7 +6,7 @@
   padding-left: 19px;
   background: #e6e6e6;
   background: -webkit-linear-gradient(top, #fafafa, #eaeaea);
-  background: linear-gradient(top, #fafafa, #eaeaea);
+  background: linear-gradient(to bottom, #fafafa, #eaeaea);
   color: #555;
   border-color: #d4d4d4;
   border-bottom-color: #bcbcbc;
@@ -16,7 +16,7 @@
 .social-likes__button_github:hover {
   background: #efefef;
   background: -webkit-linear-gradient(top, #fff, #f0f0f0);
-  background: linear-gradient(top, #fff, #f0f0f0);
+  background: linear-gradient(to bottom, #fff, #f0f0f0);
   color: #444;
   border-color: #d4d4d4;
   border-bottom-color: #bcbcbc;
@@ -34,4 +34,4 @@
 
 .social-likes__counter_github:after {
   border-right-color: #fafafa;
-}
+}

social-likes.jquery.json

@@ -12,7 +12,7 @@
     "google",
     "livejournal"
   ],
-  "version": "2.0.12",
+  "version": "2.0.13",
   "author": {
     "name": "Artem Sapegin",
     "email": "artem@sapegin.ru",

src/social-likes.js

@@ -241,7 +241,7 @@ SocialLikes.prototype = {
 	},
 	initUserButtons: function() {
 		if (!this.userButtonInited && window.socialLikesButtons) {
-			$.extend(services, socialLikesButtons);
+			$.extend(true, services, socialLikesButtons);
 		}
 		this.userButtonInited = true;
 	},