aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2014-03-09 15:36:28 -0500
committerBrandon Mathis <brandon@imathis.com>2014-03-09 15:36:28 -0500
commitaffa3ffb8233f7b571a46a2c58aff574e470c369 (patch)
treef7b1bac835743b7a778126f2eb7e7e11b73e04f2
parentb86880352b421ad8884355ba2e2dea9b92c65996 (diff)
parentec1fbccd64fc429b138369f93c1236a8dedc7ce6 (diff)
downloadmy_new_personal_website-affa3ffb8233f7b571a46a2c58aff574e470c369.tar.xz
my_new_personal_website-affa3ffb8233f7b571a46a2c58aff574e470c369.zip
Merge pull request #1515 from rythie/master
A couple of changes to make octopress more friendly when hosted using HTTPS
-rw-r--r--.themes/classic/source/_includes/custom/head.html4
-rw-r--r--_config.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/.themes/classic/source/_includes/custom/head.html b/.themes/classic/source/_includes/custom/head.html
index 85879f4a..824a41e7 100644
--- a/.themes/classic/source/_includes/custom/head.html
+++ b/.themes/classic/source/_includes/custom/head.html
@@ -1,3 +1,3 @@
<!--Fonts from Google"s Web font directory at http://google.com/webfonts -->
-<link href="http://fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
-<link href="http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
diff --git a/_config.yml b/_config.yml
index 74d35bad..e51e7c38 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@ url: http://yoursite.com
title: My Octopress Blog
subtitle: A blogging framework for hackers.
author: Your Name
-simple_search: http://google.com/search
+simple_search: https://www.google.com/search
description:
# Default date format is "ordinal" (resulting in "July 22nd 2007")