diff options
author | Dmitriy Slupytskyi <dslupytskyi@gmail.com> | 2015-02-04 00:09:27 +0300 |
---|---|---|
committer | Dmitriy Slupytskyi <dslupytskyi@gmail.com> | 2015-02-04 00:09:27 +0300 |
commit | 1126e0dd32dd5a608e7eb8541da8d5f9675f8619 (patch) | |
tree | 5d297e54cd1d7d21411c5a7f7115a2bbc39e5564 /layouts | |
parent | f1cb25fddaf5c33134717a210b0d8c4439f0a30b (diff) | |
parent | fe5d8f1e4b9ef48661d9e22b35f57fe3bf3242b2 (diff) |
Merge branch 'master' of github.com:azmelanar/hugo-theme-pixyll
Diffstat (limited to 'layouts')
-rw-r--r-- | layouts/404.html | 5 | ||||
-rw-r--r-- | layouts/index.html | 3 | ||||
-rw-r--r-- | layouts/partials/head.html | 15 | ||||
-rw-r--r-- | layouts/shortcodes/youtube.html | 2 |
4 files changed, 18 insertions, 7 deletions
diff --git a/layouts/404.html b/layouts/404.html index 5da48f1..f96a30b 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -4,7 +4,10 @@ <div class="post p2 p-responsive wrap" role="main"> <div class="measure"> - <p>404</p> + <div align="center"> + <img src="{{ .Site.BaseUrl }}/images/404.jpg" /> + <p>Error 404</p> + </div> </div> </div> </div> diff --git a/layouts/index.html b/layouts/index.html index 0ef4d7c..11fe9f7 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -2,6 +2,9 @@ <div class="site-wrap"> {{ partial "header.html" . }} + {{ if isset .Site.Params "description" }} + <meta name="description" content="{{ .Site.Params.description }}"> + {{ end }} <div class="post p2 p-responsive wrap" role="main"> <div class="measure"> <div class="home"> diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 6ae34cb..252af06 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <title>{{ .Site.Title }} | {{ .Title }}</title> + <title>{{ .Title }} - {{ .Site.Title }}</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> @@ -11,15 +11,20 @@ <link rel="canonical" href="{{ .Permalink }}"> <!-- Custom CSS --> - <link rel="stylesheet" type="text/css" href="{{ .Site.BaseUrl }}/css/basscss.css"> - <link rel="stylesheet" type="text/css" href="{{ .Site.BaseUrl }}/css/main.css"> + <!-- Those css minifined and combined together. See combined-min.css below + <link rel="stylesheet" type="text/css" href="/css/basscss.css"> + <link rel="stylesheet" type="text/css" href="/css/main.css"> --> <!-- Highlight --> - <link rel="stylesheet" type="text/css" href="{{ .Site.BaseUrl }}/css/highlight/styles/railscasts.css"> + <!-- Also minified and combined into combined-min.css + <link rel="stylesheet" type="text/css" href="/css/highlight/styles/railscasts.css"> --> <!-- Fonts --> + <!-- Combined and minified <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic&subset=latin,cyrillic-ext,cyrillic'> - <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/css?family=Lato:900,300'> + <link rel='stylesheet' type='text/css' href='//fonts.googleapis.com/css?family=Lato:900,300'> --> + + <link rel="stylesheet" type="text/css" href="{{ .Site.BaseUrl }}/css/combined-min.css"> </head> <body class=""> diff --git a/layouts/shortcodes/youtube.html b/layouts/shortcodes/youtube.html index 08ad2a5..e6889bf 100644 --- a/layouts/shortcodes/youtube.html +++ b/layouts/shortcodes/youtube.html @@ -1,6 +1,6 @@ <div class="embed video-player"> <iframe class="youtube-player" type="text/html" width="640" height="385" - src="http://www.youtube.com/embed/{{ index .Params 0 }}" allowfullscreen + src="//www.youtube.com/embed/{{ index .Params 0 }}" allowfullscreen frameborder="0"/> </iframe> </div> |