Merge upstream of the fork

This commit is contained in:
Alexis Tacnet
2016-12-26 17:06:24 +01:00
5 changed files with 5 additions and 18 deletions

2
archetypes/default.md Normal file
View File

@@ -0,0 +1,2 @@
+++
+++

View File

@@ -19,7 +19,7 @@ blog = "blog/:slug/"
author = "Arthur Dent" author = "Arthur Dent"
# gravatar = "" # do not use in the same time as Avatar # gravatar = "" # do not use in the same time as Avatar
# avatar = "" # path to image in static dir e.g img/avatar.png (do not use in the same time as Gravatar) # avatar = "" # path to image in static dir e.g img/avatar.png (do not use in the same time as Gravatar)
cachebuster = true # cachebuster = false # FIXME: See issue #32.
dateform = "Jan 2, 2006" dateform = "Jan 2, 2006"
dateformfull = "Mon Jan 2 2006 15:04:05 MST" dateformfull = "Mon Jan 2 2006 15:04:05 MST"
description = "Don't panic" description = "Don't panic"

View File

@@ -14,9 +14,6 @@
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.8.0/styles/default.min.css"> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.8.0/styles/default.min.css">
{{ end }} {{ end }}
{{ if eq true .Site.Params.cachebuster }}
<link rel="stylesheet" href="/css/reset.css"> <link rel="stylesheet" href="/css/reset.css">
<link rel="stylesheet" href="/css/pygments.css"> <link rel="stylesheet" href="/css/pygments.css">
<link rel="stylesheet" href="/css/main.css"> <link rel="stylesheet" href="/css/main.css">
@@ -25,18 +22,6 @@
<link rel="stylesheet" href="{{.}}"> <link rel="stylesheet" href="{{.}}">
{{end}} {{end}}
{{ else }}
<link rel="stylesheet" href="/css/reset.css?{{ .Now.Unix }}">
<link rel="stylesheet" href="/css/pygments.css?{{ .Now.Unix }}">
<link rel="stylesheet" href="/css/main.css?{{ .Now.Unix }}">
{{range .Site.Params.extracssfiles}}
<link rel="stylesheet" href="{{.}}?{{ .Now.Unix }}">
{{end}}
{{ end }}
<!-- Icon --> <!-- Icon -->
<link rel="shortcut icon" <link rel="shortcut icon"
{{ if .Site.Params.faviconfile }} {{ if .Site.Params.faviconfile }}

View File

@@ -3,4 +3,5 @@
<meta name="HandheldFriendly" content="True"> <meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320"> <meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="referrer" content="no-referrer">
{{ if .Site.Params.description }}<meta name="description" content="{{ .Site.Params.description }}">{{ end }} {{ if .Site.Params.description }}<meta name="description" content="{{ .Site.Params.description }}">{{ end }}

View File

@@ -593,7 +593,7 @@ section.main .content .markdown h5,
section.main .content .markdown h6 { section.main .content .markdown h6 {
font-size: 22px; font-size: 22px;
letter-spacing: -0.005rem; letter-spacing: -0.005rem;
font-weight: 800; font-weight: 700;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
font-smoothing: antialiased; font-smoothing: antialiased;
@@ -619,7 +619,6 @@ section.main .content .markdown h6 {
font-size: 1rem; font-size: 1rem;
margin-bottom: 1rem; margin-bottom: 1rem;
letter-spacing: none; letter-spacing: none;
text-transform: none;
} }
section.main .content .markdown code, section.main .content .markdown code,
section.main .content .markdown pre { section.main .content .markdown pre {