diff --git a/README.md b/README.md index ac804bd..ee4c476 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ __`hyde-hyde`__ is a [Hugo](https://gohugo.io)'s theme derived from @spf13's [Hy You can see a real site in action [here](https://htr3n.github.io). -![hyde-hyde main screen](https://github.com/htr3n/hyde-hyde/blob/master/images/hyde-hyde-main.PNG) +![hyde-hyde main screen](https://github.com/htr3n/hyde-hyde/blob/master/images/main.png) -![hyde-hyde main screen](https://github.com/htr3n/hyde-hyde/blob/master/images/hyde-hyde-posts.PNG) +![hyde-hyde main screen](https://github.com/htr3n/hyde-hyde/blob/master/images/posts.png) ## Installation diff --git a/images/hyde-hyde-main.PNG b/images/main.png similarity index 100% rename from images/hyde-hyde-main.PNG rename to images/main.png diff --git a/images/hyde-hyde-posts.PNG b/images/posts.png similarity index 100% rename from images/hyde-hyde-posts.PNG rename to images/posts.png diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8c1066f..300045f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,9 +2,10 @@ {{ partial "sidebar.html" . }}
- {{ block "main" . -}}{{- end }} + {{ block "main" . }}{{ end }}
- - {{ template "_internal/google_analytics_async.html" . }} +
+ {{ block "footer" . }}{{ end }} +
\ No newline at end of file diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 19b9784..a7cdba9 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,10 +1,19 @@ -{{ define "main" -}} -

Blog Posts

+{{ define "main" }} +

{{ .Title }}

+{{- 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 4462e8b..074dc32 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -33,9 +33,25 @@ {{ end }} {{ .Content }} - -{{ if .Site.DisqusShortname -}} -

Comments

-{{ template "_internal/disqus.html" . }} {{- end }} -{{- end }} \ No newline at end of file + +{{ 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 }} +{{- end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 5884b88..4b8af29 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -17,7 +17,6 @@ - diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 7823850..f4c7df6 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -10,7 +10,7 @@
diff --git a/static/css/custom.css b/static/css/custom.css index 45128b5..16ae817 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -1,12 +1,8 @@ -body { +html, body { font-family: "Fira Sans", sans-serif; - font-size: 16px; - font-weight: 300 !important; -} - -code { - font-family: monospace; - font-size: .9rem; + font-size: 18px; + font-weight: 300; + line-height: 1.5; } .img-circle { @@ -19,19 +15,24 @@ code { } .brand { - font-size: 3.0em; + font-size: 2.6em; margin-bottom: 0; } -span, p, code { - font-size: 1.33vw; -} - .text-center { text-align:center; } .meta { - font-size: .9rem !important; + font-size: .8rem !important; font-weight: 300; } + +pre { + padding: 2px; + tab-size: 2; +} + +pre > code { + font-family: monospace; +} \ No newline at end of file diff --git a/static/css/syntax.css b/static/css/syntax.css index 1264b87..33ce367 100644 --- a/static/css/syntax.css +++ b/static/css/syntax.css @@ -1,66 +1,59 @@ -.hll { background-color: #ffffcc } - /*{ background: #f0f3f3; }*/ -.c { color: #999; } /* Comment */ -.err { color: #AA0000; background-color: #FFAAAA } /* Error */ -.k { color: #006699; } /* Keyword */ -.o { color: #555555 } /* Operator */ -.cm { color: #0099FF; font-style: italic } /* Comment.Multiline */ -.cp { color: #009999 } /* Comment.Preproc */ -.c1 { color: #999; } /* Comment.Single */ -.cs { color: #999; } /* Comment.Special */ -.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */ -.ge { font-style: italic } /* Generic.Emph */ -.gr { color: #FF0000 } /* Generic.Error */ -.gh { color: #003300; } /* Generic.Heading */ -.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */ -.go { color: #AAAAAA } /* Generic.Output */ -.gp { color: #000099; } /* Generic.Prompt */ -.gs { } /* Generic.Strong */ -.gu { color: #003300; } /* Generic.Subheading */ -.gt { color: #99CC66 } /* Generic.Traceback */ -.kc { color: #006699; } /* Keyword.Constant */ -.kd { color: #006699; } /* Keyword.Declaration */ -.kn { color: #006699; } /* Keyword.Namespace */ -.kp { color: #006699 } /* Keyword.Pseudo */ -.kr { color: #006699; } /* Keyword.Reserved */ -.kt { color: #007788; } /* Keyword.Type */ -.m { color: #FF6600 } /* Literal.Number */ -.s { color: #d44950 } /* Literal.String */ -.na { color: #4f9fcf } /* Name.Attribute */ -.nb { color: #336666 } /* Name.Builtin */ -.nc { color: #00AA88; } /* Name.Class */ -.no { color: #336600 } /* Name.Constant */ -.nd { color: #9999FF } /* Name.Decorator */ -.ni { color: #999999; } /* Name.Entity */ -.ne { color: #CC0000; } /* Name.Exception */ -.nf { color: #CC00FF } /* Name.Function */ -.nl { color: #9999FF } /* Name.Label */ -.nn { color: #00CCFF; } /* Name.Namespace */ -.nt { color: #2f6f9f; } /* Name.Tag */ -.nv { color: #003333 } /* Name.Variable */ -.ow { color: #000000; } /* Operator.Word */ -.w { color: #bbbbbb } /* Text.Whitespace */ -.mf { color: #FF6600 } /* Literal.Number.Float */ -.mh { color: #FF6600 } /* Literal.Number.Hex */ -.mi { color: #FF6600 } /* Literal.Number.Integer */ -.mo { color: #FF6600 } /* Literal.Number.Oct */ -.sb { color: #CC3300 } /* Literal.String.Backtick */ -.sc { color: #CC3300 } /* Literal.String.Char */ -.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */ -.s2 { color: #CC3300 } /* Literal.String.Double */ -.se { color: #CC3300; } /* Literal.String.Escape */ -.sh { color: #CC3300 } /* Literal.String.Heredoc */ -.si { color: #AA0000 } /* Literal.String.Interpol */ -.sx { color: #CC3300 } /* Literal.String.Other */ -.sr { color: #33AAAA } /* Literal.String.Regex */ -.s1 { color: #CC3300 } /* Literal.String.Single */ -.ss { color: #FFCC33 } /* Literal.String.Symbol */ -.bp { color: #336666 } /* Name.Builtin.Pseudo */ -.vc { color: #003333 } /* Name.Variable.Class */ -.vg { color: #003333 } /* Name.Variable.Global */ -.vi { color: #003333 } /* Name.Variable.Instance */ -.il { color: #FF6600 } /* Literal.Number.Integer.Long */ - -.css .o, -.css .o + .nt, -.css .nt + .nt { color: #999; } +/* Background */ .chroma { color: #f8f8f2; background-color: #272822 } +/* Error */ .chroma .err { color: #960050; background-color: #1e0010 } +/* 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 } +/* GenericEmph */ .chroma .ge { font-style: italic } +/* GenericInserted */ .chroma .gi { color: #a6e22e } +/* GenericStrong */ .chroma .gs { font-weight: bold } +/* GenericSubheading */ .chroma .gu { color: #75715e } diff --git a/theme.toml b/theme.toml index 1b187eb..2eef21f 100644 --- a/theme.toml +++ b/theme.toml @@ -2,8 +2,8 @@ name = "hyde-hyde" license = "MIT" licenselink = "https://github.com/htr3n/hyde-hyde/blob/master/LICENSE.md" description = "A forked/derived version of Hyde" -tags = ["blog", "theme", "hyde"] -features = ["blog", "theme"] +tags = ["Blog", "Theme", "Hyde", "Highlight.js"] +features = ["blog", "theme", "highlight.js"] min_version = "0.33" [author]