Version bump 1.0.2

Merge pull request #18 from fancyfarfalle/master
Add support for custom favicon
2018-01-18 22:54:32 +00:00 · 2018-01-18 09:13:46 +00:00 · 2018-01-18 09:13:01 +00:00 · 2018-01-17 19:49:52 -05:00 · 2018-01-02 10:46:40 +00:00 · 2018-01-02 10:46:14 +00:00
3 changed files with 11 additions and 4 deletions
--- a/_config.yml
+++ b/_config.yml
@@ -60,6 +60,7 @@ defaults:
 encoding: utf-8 # Make sure the encoding is right
 title: "Garth" # Site name or title
 logo: "/assets/logo.svg" # Site logo
+# favicon: "/favicon.ico" # Uncomment to add custom favicon, or leave as is to use site logo
 description: "A stupidly simple theme for Jekyll, using the official Jekyll theme implementation" # Site description and default description
 url: "https://garth.darn.es" # Site url
 baseurl: ""
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -9,13 +9,19 @@
 			<title>{{ page.title }} - {{ site.title }}</title>
 		{% endif %}

-    <link rel="stylesheet" href="{{ "/assets/styles.css" | relative_url }}">
-		<link rel="shortcut icon" href="{{ site.logo }}">
+		<link rel="stylesheet" href="{{ "/assets/styles.css" | relative_url }}">
+		
+		{% if site.favicon %}
+			<link rel="shortcut icon" href="{{ site.favicon }}">
+		{% else %}
+			<link rel="shortcut icon" href="{{ site.logo }}">
+		{% endif %}
+		
 	</head>
 	<body>

 		{{ content }}

-		<link href="https://fonts.googleapis.com/css?family=Alegreya+Sans|Neuton" rel="stylesheet">
+		<link href="https://fonts.googleapis.com/css?family=Alegreya+Sans:400,400i,700|Neuton:400,700" rel="stylesheet">
 	</body>
 </html>
--- a/garth-jekyll-theme.gemspec
+++ b/garth-jekyll-theme.gemspec
@@ -2,7 +2,7 @@

 Gem::Specification.new do |spec|
  spec.name          = "garth-jekyll-theme"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.2"
  spec.authors       = ["David Darnes"]
  spec.email         = ["me@daviddarnes.com"]
Author	SHA1	Message	Date
David Darnes	b722a2dcf3	Version bump 1.0.2	2018-01-18 22:54:32 +00:00
David Darnes	8ecd69056b	Merge pull request #18 from fancyfarfalle/master Add support for custom favicon	2018-01-18 09:13:46 +00:00
David Darnes	e8de80b9c7	Just a little formatting for niceness	2018-01-18 09:13:01 +00:00
Thayer Luscian	9a03c1512f	Add support for custom favicon	2018-01-17 19:49:52 -05:00
David Darnes	6205b00a48	Version bump	2018-01-02 10:46:40 +00:00
David Darnes	12887a1c76	Make sure correct font weights are loaded #7	2018-01-02 10:46:14 +00:00