Skip to content

Commit

Permalink
Merge pull request #70 from mrdaveanderson/gh-pages
Browse files Browse the repository at this point in the history
pr to enable https serving on github
  • Loading branch information
jacobtomlinson committed Sep 1, 2016
2 parents bf17a83 + 52f2c80 commit 81ee641
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Expand Up @@ -5,7 +5,7 @@ description: "A dark blog theme for Jekyll."
baseurl: ""
url: "http://carte-noire.jacobtomlinson.co.uk/"
title_description: "A dark blog theme for Jekyll focusing on a clear reading experience. Large text and a narrow body makes carte noire a gorgeous read. With excellent code snippet support and integrated tools such as AddThis and Disqus giving your Jekyll blog all the functionality your users expect."
title_image: "http://www.gravatar.com/avatar/00000000000000000000000000000000?s=500&d=mm"
title_image: "https://www.gravatar.com/avatar/00000000000000000000000000000000?s=500&d=mm"
google_analytics: "UA-20365477-4"
disqus_account: cartenoire
github_repository: https://github.com/jacobtomlinson/carte-noire
Expand Down
4 changes: 2 additions & 2 deletions _data/thumbnail.yml
@@ -1,2 +1,2 @@
gravatar: "http://www.gravatar.com/avatar/00000000000000000000000000000000?s=500&d=mm"
jekyll: "http://i.imgur.com/aRQcGSi.png"
gravatar: "https://www.gravatar.com/avatar/00000000000000000000000000000000?s=500&d=mm"
jekyll: "https://i.imgur.com/aRQcGSi.png"
2 changes: 1 addition & 1 deletion _includes/footer.html
Expand Up @@ -10,7 +10,7 @@
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
<script src="{{ site.baseurl }}/js/jquery.mmenu.min.all.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
<script type="text/javascript">
$(document).ready(function() {
Expand Down
4 changes: 2 additions & 2 deletions _includes/head.html
Expand Up @@ -4,7 +4,7 @@
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{{ site.description }}">

<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="profile" href="https://gmpg.org/xfn/11" />
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
<link rel="stylesheet" type="text/css" media="all" href="{{ site.baseurl }}/css/style.css" />
Expand Down Expand Up @@ -39,7 +39,7 @@

{% if page.content contains '<script type="math/tex' %}
<!-- MathJax for LaTeX -->
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
{% endif %}

</head>
2 changes: 1 addition & 1 deletion _includes/social_links.html
@@ -1,5 +1,5 @@
<p class="links">
{% if site.twitter_username %}<a href="http://www.twitter.com/{{ site.twitter_username }}" target="_new"><i class="fa fa-twitter"></i></a>{% endif %}
{% if site.twitter_username %}<a href="https://www.twitter.com/{{ site.twitter_username }}" target="_new"><i class="fa fa-twitter"></i></a>{% endif %}
{% if site.linkedin_link %}<a href="{{ site.linkedin_link }}" target="_new"><i class="fa fa-linkedin"></i></a>{% endif %}
{% if site.google_plus_link %}<a href="{{ site.google_plus_link }}" target="_new"><i class="fa fa-google-plus"></i></a>{% endif %}
{% if site.github_username %}<a href="https://github.com/{{ site.github_username }}" target="_new"><i class="fa fa-github-alt"></i></a>{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion _posts/2014-06-10-carte-noire-in-action.md
Expand Up @@ -74,7 +74,7 @@ This allows your content to have the proper informational and contextual hierarc

### Images look great, too

![Thumper](http://i.imgur.com/DMCHDqF.jpg)
![Thumper](https://i.imgur.com/DMCHDqF.jpg)


### Stylish blockquotes included
Expand Down
6 changes: 3 additions & 3 deletions css/style.scss
@@ -1,8 +1,8 @@
---
---
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,400,300,700);
@import url(http://fonts.googleapis.com/css?family=Montserrat);
@import url(http://fonts.googleapis.com/css?family=Anonymous+Pro:400,700);
@import url(https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,400,300,700);
@import url(https://fonts.googleapis.com/css?family=Montserrat);
@import url(https://fonts.googleapis.com/css?family=Anonymous+Pro:400,700);

/* Colours */
$twitter: #6dabda;
Expand Down

0 comments on commit 81ee641

Please sign in to comment.