From 6d3eb3fed6755f5ede69ac287d4e2452bfc3a824 Mon Sep 17 00:00:00 2001
From: Vincent Ollivier <me@vinc.cc>
Date: Thu, 23 May 2013 21:43:18 +0200
Subject: Added !default to $img-border

---
 .themes/classic/sass/base/_theme.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.themes')

diff --git a/.themes/classic/sass/base/_theme.scss b/.themes/classic/sass/base/_theme.scss
index 1a43a03d..20dcd24e 100644
--- a/.themes/classic/sass/base/_theme.scss
+++ b/.themes/classic/sass/base/_theme.scss
@@ -1,5 +1,5 @@
 $noise-bg: image-url('noise.png') top left !default;
-$img-border: inline-image('dotted-border.png');
+$img-border: inline-image('dotted-border.png') !default;
 
 // Main Link Colors
 $link-color: lighten(#165b94, 3) !default;
-- 
cgit v1.2.1


From 27dcfa1a510cece7ede8ad26fd0cfa475552b7ea Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 25 Jun 2013 18:29:28 -0400
Subject: Use protocol relative URL for Twitter

---
 .themes/classic/source/_includes/twitter_sharing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.themes')

diff --git a/.themes/classic/source/_includes/twitter_sharing.html b/.themes/classic/source/_includes/twitter_sharing.html
index 687e77de..7cd5fbc2 100644
--- a/.themes/classic/source/_includes/twitter_sharing.html
+++ b/.themes/classic/source/_includes/twitter_sharing.html
@@ -4,7 +4,7 @@
       var twitterWidgets = document.createElement('script');
       twitterWidgets.type = 'text/javascript';
       twitterWidgets.async = true;
-      twitterWidgets.src = 'http://platform.twitter.com/widgets.js';
+      twitterWidgets.src = '//platform.twitter.com/widgets.js';
       document.getElementsByTagName('head')[0].appendChild(twitterWidgets);
     })();
   </script>
-- 
cgit v1.2.1


From 09789773eb0fc4691c6054d5f2b16d0f3b16776a Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 25 Jun 2013 18:34:06 -0400
Subject: Fix second Twitter URL to be protocol relative

---
 .themes/classic/source/_includes/post/sharing.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.themes')

diff --git a/.themes/classic/source/_includes/post/sharing.html b/.themes/classic/source/_includes/post/sharing.html
index e32500d0..d639faa1 100644
--- a/.themes/classic/source/_includes/post/sharing.html
+++ b/.themes/classic/source/_includes/post/sharing.html
@@ -1,6 +1,6 @@
 <div class="sharing">
   {% if site.twitter_tweet_button %}
-  <a href="http://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-via="{{ site.twitter_user }}" data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
+  <a href="//twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-via="{{ site.twitter_user }}" data-counturl="{{ site.url }}{{ page.url }}" >Tweet</a>
   {% endif %}
   {% if site.google_plus_one %}
   <div class="g-plusone" data-size="{{ site.google_plus_one_size }}"></div>
-- 
cgit v1.2.1


From 962798293bb70de73d00836c0555c3de0588c287 Mon Sep 17 00:00:00 2001
From: Daphne Lin <daphnehello@gmail.com>
Date: Mon, 15 Jul 2013 23:28:45 -0400
Subject: Remove redundant reset-html5, global-reset already calls reset-html5

---
 .themes/classic/sass/screen.scss | 1 -
 1 file changed, 1 deletion(-)

(limited to '.themes')

diff --git a/.themes/classic/sass/screen.scss b/.themes/classic/sass/screen.scss
index 155e81e9..75eac0a2 100644
--- a/.themes/classic/sass/screen.scss
+++ b/.themes/classic/sass/screen.scss
@@ -1,6 +1,5 @@
 @import "compass";
 @include global-reset;
-@include reset-html5;
 
 @import "custom/colors";
 @import "custom/fonts";
-- 
cgit v1.2.1