diff options
| author | Hadi Sinaee <sinaee.hadi@gmail.com> | 2019-08-25 12:35:43 +0300 |
|---|---|---|
| committer | Hadi Sinaee <sinaee.hadi@gmail.com> | 2019-08-25 12:35:43 +0300 |
| commit | b6459f3545aa328593c4fa36d5a2f74fb577a420 (patch) | |
| tree | dc99259a23b12d6b4e8a82b8f9edc6cd69c46f33 | |
| parent | a19dfe2e441ec1c0dca498843dfaacc815a348a1 (diff) | |
| parent | 630fec5db86bcd5f12558ba038c47ecc09a67138 (diff) | |
Merge branch 'pr-12/g8a9/single_page_template' into PR-12
| -rw-r--r-- | layouts/_default/baseof.html | 5 | ||||
| -rw-r--r-- | layouts/_default/single.html | 6 | ||||
| -rw-r--r-- | layouts/partials/header.html | 18 | ||||
| -rw-r--r-- | static/css/main.css | 9 |
4 files changed, 23 insertions, 15 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0305c4d..367897b 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,10 @@ <!DOCTYPE html> <html> - {{- partial "head.html" . -}} + {{ partial "header.html" . }} <body> - {{- partial "header.html" . -}} <div id="content"> {{- block "main" . }}{{- end -}} </div> - {{- partial "footer.html" . -}} + {{ partial "footer.html" . }} </body> </html> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 93ef78c..dde1a8b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,11 +1,11 @@ {{ define "main" }} - <div class="header"> + <div class="header"> <img src="logo.png" class="logo"> </div> - <div class="content wrapper"> + <div class="content wrapper"> {{ .Content | markdownify }} </div> - {{end}} +{{end}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index c738442..cdb3d8c 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -9,11 +9,11 @@ <title>{{ $title }} - {{ $siteTitle }}</title> {{- end -}} - <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png"> - <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png"> - <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png"> - <link rel="manifest" href="site.webmanifest"> - <link rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5"> + <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> + <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"> + <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"> + <link rel="manifest" href="/site.webmanifest"> + <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5"> <meta name="msapplication-TileColor" content="#da532c"> <meta name="theme-color" content="#ffffff"> @@ -26,13 +26,13 @@ {{- template "_internal/twitter_cards.html" . -}} <link href="https://fonts.googleapis.com/css?family=Ubuntu:300,400,300italic,400italic|Raleway:500,100,300" rel="stylesheet"> - <link rel="stylesheet" type="text/css" media="screen" href="css/normalize.css" /> - <link rel="stylesheet" type="text/css" media="screen" href="css/main.css" /> + <link rel="stylesheet" type="text/css" media="screen" href="/css/normalize.css" /> + <link rel="stylesheet" type="text/css" media="screen" href="/css/main.css" /> {{- if and (isset .Site.Params "social") (isset .Site.Params "feathericonscdn") (eq .Site.Params.featherIconsCDN true) -}} <script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js"></script> {{- else if (isset .Site.Params "social") -}} - <script src="js/feather.min.js"></script> + <script src="/js/feather.min.js"></script> {{- end -}} - <script src="js/main.js"></script> + <script src="/js/main.js"></script> </head> diff --git a/static/css/main.css b/static/css/main.css index 55e595a..775bd2c 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -207,6 +207,15 @@ ul { /* float: left; */ } +.header .logo { + display: block; + margin-left: auto; + margin-right: auto; + max-width: 15%; + height: auto; + border-radius: 50%; +} + .header h1, .header h2 { margin: 0; |