From cf95cacd1569372ffd343fae6ff56432a6c0f687 Mon Sep 17 00:00:00 2001 From: Huy Tran Date: Tue, 23 Jan 2018 10:02:05 +0700 Subject: [PATCH] refactoring the footer --- layouts/_default/baseof.html | 10 ++-- layouts/_default/list.html | 5 +- layouts/_default/single.html | 46 +++++++------- layouts/partials/disqus.html | 23 +++++++ layouts/partials/head.html | 75 ++++++++++++----------- layouts/partials/social.html | 69 +++++++++++---------- static/css/custom.css | 6 +- static/css/main.css | 0 static/css/syntax.css | 112 +++++++++++++++++++---------------- static/js/main.js | 0 10 files changed, 193 insertions(+), 153 deletions(-) create mode 100644 layouts/partials/disqus.html create mode 100644 static/css/main.css create mode 100644 static/js/main.js diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 300045f..c7ed356 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,11 @@ {{ partial "head.html" . }} - {{ partial "sidebar.html" . }} + {{ partial "sidebar.html" . }}
- {{ block "main" . }}{{ end }} -
+ {{ block "main" . }}{{ end }}
- {{ block "footer" . }}{{ end }} + {{ block "footer" . }}{{ end }} +
- + \ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a7cdba9..320a629 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -10,10 +10,9 @@ {{- end }} {{ define "footer" }} - -
+ {{ if .Site.GoogleAnalytics -}} {{ template "_internal/google_analytics_async.html" . }} {{- end}} -
+ {{- end }} \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 074dc32..1103e80 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,8 +4,10 @@ {{ if ne .Params.showpagemeta false }}
- - {{ if not .Date.IsZero }} {{ .Date.Format .Site.Params.dateformat }} {{end}} + {{ if ne .Params.showpdate false }} + + {{ if not .Date.IsZero }} {{ .Date.Format .Site.Params.dateformat }} {{end}} + {{ end }} {{ if isset .Params "categories" }} {{ $total := len .Params.categories }} @@ -36,22 +38,26 @@ {{- end }} {{ define "footer" -}} - {{ if .Site.Params.highlightjs }} - - {{ range .Site.Params.highlightjslanguages }} - - {{ end }} - - {{ end }} - - {{ if .Site.GoogleAnalytics }} - {{ template "_internal/google_analytics_async.html" . }} - {{ end }} - - {{ if .Site.DisqusShortname }} -

Comments

- {{ template "_internal/disqus.html" . }} - {{ end }} + {{ if .Site.Params.highlightjs }} + + {{ range .Site.Params.highlightjslanguages }} + + {{ end }} + + {{ end }} + + {{ if .Site.GoogleAnalytics }} + {{ template "_internal/google_analytics_async.html" . }} + {{ end }} + + {{ if .Site.DisqusShortname }} + {{ if ne .Params.showcomments false }} +

Comments

+ {{ partial "disqus.html" . }} + {{ end }} + {{ end }} + + {{- end }} diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html new file mode 100644 index 0000000..231eeec --- /dev/null +++ b/layouts/partials/disqus.html @@ -0,0 +1,23 @@ +
+ + +comments powered by + Disqus + diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 4b8af29..859f761 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,35 +1,42 @@ - - - - - {{ .Hugo.Generator }} - - - - - {{ if .IsHome -}} - {{ .Site.Title }} - {{- else -}} - {{ .Title }} · {{ .Site.Title }} - {{- end }} - - - - - - - - - - {{ if .Site.Params.highlightjs }} - - {{ end }} - - - - - - - - + + + + + + + {{ with .Site.Params.meta.description }}{{ end }} + {{ with .Site.Params.meta.keywords }}{{ end }} + {{ .Hugo.Generator }} + + + {{ if .IsHome -}} + {{ .Site.Title }} + {{- else -}} + {{ .Title }} · {{ .Site.Title }} + {{- end }} + + + + + + + + + {{ if .Site.Params.highlightjs }} + + {{ end }} + + + + + + + + + + + diff --git a/layouts/partials/social.html b/layouts/partials/social.html index 2910862..b6bae42 100644 --- a/layouts/partials/social.html +++ b/layouts/partials/social.html @@ -1,38 +1,35 @@
- {{ with .Site.Params.social.twitter }} - - {{ end }} - {{ with .Site.Params.social.google }} - - {{ end }} - {{ with .Site.Params.social.facebook }} - - {{ end }} - {{ with .Site.Params.social.github }} - - {{ end }} - {{ with .Site.Params.social.instagram }} - - {{ end }} - {{ with .Site.Params.social.linkedin }} - - {{ end }} - {{ with .Site.Params.social.stackoverflow }} - - {{ end }} - {{ with .Site.Params.social.medium}} - - {{ end }} - {{ with .Site.Params.social.devto}} - - {{ end }} - {{ with .Site.Params.social.angellist}} - - {{ end }} - {{ with .Site.Params.social.email }} - - {{ end }} - {{ with .Site.Params.social.xing }} - - {{ end }} + {{ with .Site.Params.social.twitter }} + + {{ end }} + {{ with .Site.Params.social.google }} + + {{ end }} + {{ with .Site.Params.social.facebook }} + + {{ end }} + {{ with .Site.Params.social.github }} + + {{ end }} + {{ with .Site.Params.social.bitbucket }} + + {{ end }} + {{ with .Site.Params.social.instagram }} + + {{ end }} + {{ with .Site.Params.social.linkedin }} + + {{ end }} + {{ with .Site.Params.social.stackoverflow }} + + {{ end }} + {{ with .Site.Params.social.medium}} + + {{ end }} + {{ with .Site.Params.social.xing }} + + {{ end }} + {{ with .Site.Params.social.email }} + + {{ end }}
diff --git a/static/css/custom.css b/static/css/custom.css index 16ae817..1f52e24 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -29,10 +29,10 @@ html, body { } pre { - padding: 2px; + padding: 1px; tab-size: 2; } -pre > code { +pre, code { font-family: monospace; -} \ No newline at end of file +} diff --git a/static/css/main.css b/static/css/main.css new file mode 100644 index 0000000..e69de29 diff --git a/static/css/syntax.css b/static/css/syntax.css index 33ce367..71b73eb 100644 --- a/static/css/syntax.css +++ b/static/css/syntax.css @@ -1,59 +1,67 @@ -/* Background */ .chroma { color: #f8f8f2; background-color: #272822 } -/* Error */ .chroma .err { color: #960050; background-color: #1e0010 } +/* Background */ .chroma { background-color: #f0f0f0 } +/* Error */ .chroma .err { } /* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } /* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: 100%; overflow: auto; display: block; } /* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc } /* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; display: block; } /* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; } -/* Keyword */ .chroma .k { color: #66d9ef } -/* KeywordConstant */ .chroma .kc { color: #66d9ef } -/* KeywordDeclaration */ .chroma .kd { color: #66d9ef } -/* KeywordNamespace */ .chroma .kn { color: #f92672 } -/* KeywordPseudo */ .chroma .kp { color: #66d9ef } -/* KeywordReserved */ .chroma .kr { color: #66d9ef } -/* KeywordType */ .chroma .kt { color: #66d9ef } -/* NameAttribute */ .chroma .na { color: #a6e22e } -/* NameClass */ .chroma .nc { color: #a6e22e } -/* NameConstant */ .chroma .no { color: #66d9ef } -/* NameDecorator */ .chroma .nd { color: #a6e22e } -/* NameException */ .chroma .ne { color: #a6e22e } -/* NameFunction */ .chroma .nf { color: #a6e22e } -/* NameOther */ .chroma .nx { color: #a6e22e } -/* NameTag */ .chroma .nt { color: #f92672 } -/* Literal */ .chroma .l { color: #ae81ff } -/* LiteralDate */ .chroma .ld { color: #e6db74 } -/* LiteralString */ .chroma .s { color: #e6db74 } -/* LiteralStringAffix */ .chroma .sa { color: #e6db74 } -/* LiteralStringBacktick */ .chroma .sb { color: #e6db74 } -/* LiteralStringChar */ .chroma .sc { color: #e6db74 } -/* LiteralStringDelimiter */ .chroma .dl { color: #e6db74 } -/* LiteralStringDoc */ .chroma .sd { color: #e6db74 } -/* LiteralStringDouble */ .chroma .s2 { color: #e6db74 } -/* LiteralStringEscape */ .chroma .se { color: #ae81ff } -/* LiteralStringHeredoc */ .chroma .sh { color: #e6db74 } -/* LiteralStringInterpol */ .chroma .si { color: #e6db74 } -/* LiteralStringOther */ .chroma .sx { color: #e6db74 } -/* LiteralStringRegex */ .chroma .sr { color: #e6db74 } -/* LiteralStringSingle */ .chroma .s1 { color: #e6db74 } -/* LiteralStringSymbol */ .chroma .ss { color: #e6db74 } -/* LiteralNumber */ .chroma .m { color: #ae81ff } -/* LiteralNumberBin */ .chroma .mb { color: #ae81ff } -/* LiteralNumberFloat */ .chroma .mf { color: #ae81ff } -/* LiteralNumberHex */ .chroma .mh { color: #ae81ff } -/* LiteralNumberInteger */ .chroma .mi { color: #ae81ff } -/* LiteralNumberIntegerLong */ .chroma .il { color: #ae81ff } -/* LiteralNumberOct */ .chroma .mo { color: #ae81ff } -/* Operator */ .chroma .o { color: #f92672 } -/* OperatorWord */ .chroma .ow { color: #f92672 } -/* Comment */ .chroma .c { color: #75715e } -/* CommentHashbang */ .chroma .ch { color: #75715e } -/* CommentMultiline */ .chroma .cm { color: #75715e } -/* CommentSingle */ .chroma .c1 { color: #75715e } -/* CommentSpecial */ .chroma .cs { color: #75715e } -/* CommentPreproc */ .chroma .cp { color: #75715e } -/* CommentPreprocFile */ .chroma .cpf { color: #75715e } -/* GenericDeleted */ .chroma .gd { color: #f92672 } +/* Keyword */ .chroma .k { color: #007020; font-weight: bold } +/* KeywordConstant */ .chroma .kc { color: #007020; font-weight: bold } +/* KeywordDeclaration */ .chroma .kd { color: #007020; font-weight: bold } +/* KeywordNamespace */ .chroma .kn { color: #007020; font-weight: bold } +/* KeywordPseudo */ .chroma .kp { color: #007020 } +/* KeywordReserved */ .chroma .kr { color: #007020; font-weight: bold } +/* KeywordType */ .chroma .kt { color: #902000 } +/* NameAttribute */ .chroma .na { color: #4070a0 } +/* NameBuiltin */ .chroma .nb { color: #007020 } +/* NameClass */ .chroma .nc { color: #0e84b5; font-weight: bold } +/* NameConstant */ .chroma .no { color: #60add5 } +/* NameDecorator */ .chroma .nd { color: #555555; font-weight: bold } +/* NameEntity */ .chroma .ni { color: #d55537; font-weight: bold } +/* NameException */ .chroma .ne { color: #007020 } +/* NameFunction */ .chroma .nf { color: #06287e } +/* NameLabel */ .chroma .nl { color: #002070; font-weight: bold } +/* NameNamespace */ .chroma .nn { color: #0e84b5; font-weight: bold } +/* NameTag */ .chroma .nt { color: #062873; font-weight: bold } +/* NameVariable */ .chroma .nv { color: #bb60d5 } +/* LiteralString */ .chroma .s { color: #4070a0 } +/* LiteralStringAffix */ .chroma .sa { color: #4070a0 } +/* LiteralStringBacktick */ .chroma .sb { color: #4070a0 } +/* LiteralStringChar */ .chroma .sc { color: #4070a0 } +/* LiteralStringDelimiter */ .chroma .dl { color: #4070a0 } +/* LiteralStringDoc */ .chroma .sd { color: #4070a0; font-style: italic } +/* LiteralStringDouble */ .chroma .s2 { color: #4070a0 } +/* LiteralStringEscape */ .chroma .se { color: #4070a0; font-weight: bold } +/* LiteralStringHeredoc */ .chroma .sh { color: #4070a0 } +/* LiteralStringInterpol */ .chroma .si { color: #70a0d0; font-style: italic } +/* LiteralStringOther */ .chroma .sx { color: #c65d09 } +/* LiteralStringRegex */ .chroma .sr { color: #235388 } +/* LiteralStringSingle */ .chroma .s1 { color: #4070a0 } +/* LiteralStringSymbol */ .chroma .ss { color: #517918 } +/* LiteralNumber */ .chroma .m { color: #40a070 } +/* LiteralNumberBin */ .chroma .mb { color: #40a070 } +/* LiteralNumberFloat */ .chroma .mf { color: #40a070 } +/* LiteralNumberHex */ .chroma .mh { color: #40a070 } +/* LiteralNumberInteger */ .chroma .mi { color: #40a070 } +/* LiteralNumberIntegerLong */ .chroma .il { color: #40a070 } +/* LiteralNumberOct */ .chroma .mo { color: #40a070 } +/* Operator */ .chroma .o { color: #666666 } +/* OperatorWord */ .chroma .ow { color: #007020; font-weight: bold } +/* Comment */ .chroma .c { color: #60a0b0; font-style: italic } +/* CommentHashbang */ .chroma .ch { color: #60a0b0; font-style: italic } +/* CommentMultiline */ .chroma .cm { color: #60a0b0; font-style: italic } +/* CommentSingle */ .chroma .c1 { color: #60a0b0; font-style: italic } +/* CommentSpecial */ .chroma .cs { color: #60a0b0; background-color: #fff0f0 } +/* CommentPreproc */ .chroma .cp { color: #007020 } +/* CommentPreprocFile */ .chroma .cpf { color: #007020 } +/* GenericDeleted */ .chroma .gd { color: #a00000 } /* GenericEmph */ .chroma .ge { font-style: italic } -/* GenericInserted */ .chroma .gi { color: #a6e22e } +/* GenericError */ .chroma .gr { color: #ff0000 } +/* GenericHeading */ .chroma .gh { color: #000080; font-weight: bold } +/* GenericInserted */ .chroma .gi { color: #00a000 } +/* GenericOutput */ .chroma .go { color: #888888 } +/* GenericPrompt */ .chroma .gp { color: #c65d09; font-weight: bold } /* GenericStrong */ .chroma .gs { font-weight: bold } -/* GenericSubheading */ .chroma .gu { color: #75715e } +/* GenericSubheading */ .chroma .gu { color: #800080; font-weight: bold } +/* GenericTraceback */ .chroma .gt { color: #0044dd } +/* TextWhitespace */ .chroma .w { color: #bbbbbb } diff --git a/static/js/main.js b/static/js/main.js new file mode 100644 index 0000000..e69de29