Merge branch 'darkk' of https://github.com/darkk/hugo-theme-introduction into darkk-darkk

This commit is contained in:
Vicky 2018-02-03 10:06:05 -05:00
commit adce5a8bd5
3 changed files with 14 additions and 15 deletions

View file

@ -24,6 +24,7 @@ canonifyurls = true # Turns relative urls into a
description = "Website Description" # Max 160 characters show in search results description = "Website Description" # Max 160 characters show in search results
faviconFile = "img/fav.ico" faviconFile = "img/fav.ico"
highlightjs = true # Syntax highlighting highlightjs = true # Syntax highlighting
hljsTheme = true # Select highlight.js theme: https://highlightjs.org/static/demo/
footerText = "" # Text to show in footer (overrides default text) footerText = "" # Text to show in footer (overrides default text)
fadeIn = true # Turn on/off the fade-in effect fadeIn = true # Turn on/off the fade-in effect

View file

@ -35,7 +35,13 @@
<!-- CSS --> <!-- CSS -->
{{ if .Site.Params.highlightjs }} {{ 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"> <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 src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
<script>hljs.initHighlightingOnLoad();</script> <script>hljs.initHighlightingOnLoad();</script>
{{ end }} {{ end }}

View file

@ -9,24 +9,16 @@
<div class="column is-half"> {{ else if eq .Site.Params.projectColumns "3" }} <div class="column is-half"> {{ else if eq .Site.Params.projectColumns "3" }}
<div class="column is-one-third"> {{ end }} <div class="column is-one-third"> {{ end }}
<!-- Hey Vicky, show half column if number is even. --> <!-- 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"> <div class="card-image">
<figure class="image is-3by2"> <figure class="image is-3by2">
<a {{ if .Params.external_link }} <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}>
href="{{ .Params.external_link }}"
{{ else }}
id="project{{.Title | urlize}}"
{{ end }}>
<img src="{{ if .Params.image }}{{ .Params.image }}{{ else }}{{ .Site.Params.placeHolderimg }}{{ end }}"> <img src="{{ if .Params.image }}{{ .Params.image }}{{ else }}{{ .Site.Params.placeHolderimg }}{{ end }}">
</a> </a>
</figure> </figure>
</div> </div>
<div class="card-content has-text-centered top-pad"> <div class="card-content has-text-centered top-pad">
<a {{ if .Params.external_link }} <a {{ if .Params.external_link }} href="{{ .Params.external_link }}" {{ end }}>
href="{{ .Params.external_link }}"
{{ else }}
id="project{{.Title | urlize}}"
{{ end }}>
{{ .Title }} {{ .Title }}
</a> </a>
</div> </div>
@ -39,7 +31,7 @@
<!-- End Projects container --> <!-- End Projects container -->
<!-- Projects modals --> <!-- 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" id="modal{{.Title | urlize}}">
<div class="modal-background"></div> <div class="modal-background"></div>
<div class="modal-card"> <div class="modal-card">
@ -67,7 +59,7 @@
$('#modal{{.Title | urlize}}').removeClass('is-active'); $('#modal{{.Title | urlize}}').removeClass('is-active');
}); });
</script> </script>
{{ end }} {{ end }} {{ end }} {{ end }} {{ end }}
<div class="container has-text-centered top-pad"> <div class="container has-text-centered top-pad">