diff options
| author | Alexandre Perrin <alexandre.perrin@netoxygen.ch> | 2013-09-27 10:53:43 +0200 |
|---|---|---|
| committer | Alexandre Perrin <alexandre.perrin@netoxygen.ch> | 2013-09-27 10:53:43 +0200 |
| commit | 8bfd5ef3237f07125adde7043c19a3159879044a (patch) | |
| tree | 6ac9b05d53cde0c5a6c837e8316683f652f3d5cf /.themes | |
| parent | fe28c0b518e47f7929772eaaab7b0118ddcfbaad (diff) | |
| parent | f0674c69366b9172e6811036bbc5b0a29dbf6025 (diff) | |
| download | my_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.tar.xz my_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.zip | |
Merge branch 'master' of https://github.com/imathis/octopress
Diffstat (limited to '')
| -rw-r--r-- | .themes/classic/sass/base/_theme.scss | 2 | ||||
| -rw-r--r-- | .themes/classic/sass/screen.scss | 1 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/post/sharing.html | 2 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/twitter_sharing.html | 2 |
4 files changed, 3 insertions, 4 deletions
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; 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"; 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> 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> |