Merge branch 'master' of github.com:wxcafe/blog-source

themes/bootstrap2/templates/base.html

@@ -9,21 +9,7 @@
     <!-- Le styles -->
 			<link rel="stylesheet" href="{{ SITEURL }}/theme/css/extra.css" type="text/css" />
 			<link rel="stylesheet" href="{{ SITEURL }}/theme/css/bootstrap.css" type="text/css" />
-			<link href='http://fonts.googleapis.com/css?family=Oswald&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+			<link href='//fonts.googleapis.com/css?family=Oswald&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
-			<script type="text/javascript">
-				/* <![CDATA[ */
-				(function() {
-					var s = document.createElement('script');
-					var t = document.getElementsByTagName('script')[0];
-
-					s.type = 'text/javascript';
-					s.async = true;
-					s.src = '//api.flattr.com/js/0.6/load.js?'+
-							'mode=auto&uid=wxcafe&button=compact&popout=0';
-					t.parentNode.insertBefore(s, t);
- 				})();
-				/* ]]> */
-			</script>  <!-- flattr button loader -->
 			<style type="text/css">
 				body {
 					padding-top: 60px;

themes/bootstrap2/templates/sidebar.html

@@ -17,17 +17,6 @@
 	<!-- Social links -->
 	{% if SOCIAL %}
 		<li class="nav-header"><h4><i class="icon-exchange"></i> social</h4></li>
-		<a class="FlattrButton" style="display:none;"
-			title="{{ SITEURL }}"
-			style="padding-top: 10px;"
-			rel="flattr;
-				url:{{ SITEURL }};
-				title:{{ SITEURL }};
-				button:compact;
-				popout:0;
-				uid:wxcafe;
-				category:blog;"
-			href="{{ SITEURL }}">flattr</a>
 		{% for name, link, icon in SOCIAL %}
 			<li><a href="{{ link }}"><i class="icon-{{ icon }} icon-large"></i> {{ name }}</a></li>
 		{% endfor %}