diff options
| author | Vicky <vicky@vickylai.io> | 2018-02-03 18:06:05 +0300 |
|---|---|---|
| committer | Vicky <vicky@vickylai.io> | 2018-02-03 18:06:05 +0300 |
| commit | adce5a8bd553014be4920335d64f81091c5f2fa5 (patch) | |
| tree | 3d9fff1dd839d1ad932f5d5df2a3936897a03801 | |
| parent | 4333af1cff7ea61d2bebaff866ea3c0215f376db (diff) | |
| parent | 3113e1a0464e02348227900f04986ecbd924f364 (diff) | |
Merge branch 'darkk' of https://github.com/darkk/hugo-theme-introduction into darkk-darkk
| -rw-r--r-- | exampleSite/config.toml | 3 | ||||
| -rw-r--r-- | layouts/partials/header.html | 8 | ||||
| -rw-r--r-- | layouts/partials/projects.html | 18 |
3 files changed, 14 insertions, 15 deletions
diff --git a/exampleSite/config.toml b/exampleSite/config.toml index fffbd03..2a8d61d 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -24,6 +24,7 @@ canonifyurls = true # Turns relative urls into a description = "Website Description" # Max 160 characters show in search results faviconFile = "img/fav.ico" highlightjs = true # Syntax highlighting + hljsTheme = true # Select highlight.js theme: https://highlightjs.org/static/demo/ footerText = "" # Text to show in footer (overrides default text) fadeIn = true # Turn on/off the fade-in effect @@ -54,4 +55,4 @@ canonifyurls = true # Turns relative urls into a [[params.social]] url = "https://linkedin.com/" - icon = "linkedin"
\ No newline at end of file + icon = "linkedin" diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 89ca738..c775331 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -35,7 +35,13 @@ <!-- CSS --> {{ if .Site.Params.highlightjs }} +{{ if .Site.Params.hljsTheme }} +<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/{{ .Site.Params.hljsTheme }}.min.css"> +{{ else if eq .Site.Params.themeStyle "light" }} <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/default.min.css"> +{{ else }} +<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/tomorrow-night.min.css"> +{{ end }} <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script> <script>hljs.initHighlightingOnLoad();</script> {{ end }} @@ -84,4 +90,4 @@ crossorigin="anonymous"></script> <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }} -</head>
\ No newline at end of file +</head> diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index 946bc86..eca447e 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -9,24 +9,16 @@ <div class="column is-half"> {{ else if eq .Site.Params.projectColumns "3" }} <div class="column is-one-third"> {{ end }} <!-- Hey Vicky, show half column if number is even. --> - <div class="card"> + <div {{ if not .Params.external_link }} id="project{{.Title | urlize}}" {{ end }} class="card"> <div class="card-image"> <figure class="image is-3by2"> - <a {{ if .Params.external_link }} - href="{{ .Params.external_link }}" - {{ else }} - id="project{{.Title | urlize}}" - {{ end }}> + <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> <img src="{{ if .Params.image }}{{ .Params.image }}{{ else }}{{ .Site.Params.placeHolderimg }}{{ end }}"> </a> </figure> </div> <div class="card-content has-text-centered top-pad"> - <a {{ if .Params.external_link }} - href="{{ .Params.external_link }}" - {{ else }} - id="project{{.Title | urlize}}" - {{ end }}> + <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}> {{ .Title }} </a> </div> @@ -39,7 +31,7 @@ <!-- End Projects container --> <!-- Projects modals --> -{{ range sort .Pages }} {{ if eq .Section "projects" }} +{{ range sort .Pages }} {{ if eq .Section "projects" }} {{ if not .Params.external_link }} <div class="modal" id="modal{{.Title | urlize}}"> <div class="modal-background"></div> <div class="modal-card"> @@ -67,7 +59,7 @@ $('#modal{{.Title | urlize}}').removeClass('is-active'); }); </script> -{{ end }} {{ end }} +{{ end }} {{ end }} {{ end }} <div class="container has-text-centered top-pad"> |