From 63289cbc5381ffa37ed7f2a6e5f5900b77638c59 Mon Sep 17 00:00:00 2001 From: David Kebler Date: Mon, 3 Apr 2017 11:39:23 -0700 Subject: [PATCH] add code highlighting and bookmark shortcode --- layouts/partials/head/css.html | 2 ++ layouts/partials/head/fonts.html | 3 +++ layouts/partials/js.html | 2 ++ layouts/partials/navbar.html | 2 +- layouts/partials/sections.html | 2 +- layouts/shortcodes/bookmark.html | 6 ++++++ layouts/shortcodes/embed.html | 2 +- layouts/shortcodes/list.html | 10 ---------- layouts/shortcodes/social.html | 2 +- static/css/base.css | 20 ++++++++++++++++---- static/css/page.css | 24 +++++++++++++++++++++--- static/js/docready.js | 4 ++-- 12 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 layouts/shortcodes/bookmark.html delete mode 100644 layouts/shortcodes/list.html diff --git a/layouts/partials/head/css.html b/layouts/partials/head/css.html index 49e58fb..a78913e 100644 --- a/layouts/partials/head/css.html +++ b/layouts/partials/head/css.html @@ -4,6 +4,8 @@ + + diff --git a/layouts/partials/head/fonts.html b/layouts/partials/head/fonts.html index 51b8554..ccf1344 100644 --- a/layouts/partials/head/fonts.html +++ b/layouts/partials/head/fonts.html @@ -3,6 +3,9 @@ + + + {{ with .Site.Params }} diff --git a/layouts/partials/js.html b/layouts/partials/js.html index 9f272be..3c830c6 100644 --- a/layouts/partials/js.html +++ b/layouts/partials/js.html @@ -5,6 +5,8 @@ + + diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 3d4ad7f..3586ee5 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -11,7 +11,7 @@ {{ if ne .Params.navbar false }} {{ if ne .Params.hidden true }}
  • - + {{ .Params.link_text | default .Title }}
    • diff --git a/layouts/partials/sections.html b/layouts/partials/sections.html index 0ef8265..4e41619 100644 --- a/layouts/partials/sections.html +++ b/layouts/partials/sections.html @@ -1,7 +1,7 @@ {{ $parity := "odd" }} {{ range $i, $e := .Data.Pages }} {{ if ne .Params.hidden true }} -
    +

    {{ .Title }}

    diff --git a/layouts/shortcodes/bookmark.html b/layouts/shortcodes/bookmark.html new file mode 100644 index 0000000..2de630a --- /dev/null +++ b/layouts/shortcodes/bookmark.html @@ -0,0 +1,6 @@ +{{ $numOfParams := ( len .Params ) }} +{{ if eq $numOfParams 1 }} {{ .Get 0 }} {{ end }} +{{ if eq $numOfParams 2 }} {{ .Get 1 }} {{ end }} +{{ if eq $numOfParams 3 }} +{{ .Get 1 }} +{{ end }} diff --git a/layouts/shortcodes/embed.html b/layouts/shortcodes/embed.html index 84c002f..5cdd8f1 100644 --- a/layouts/shortcodes/embed.html +++ b/layouts/shortcodes/embed.html @@ -1,4 +1,4 @@ - + {{ if .IsNamedParams }}
    {{ with .Get "title" }} diff --git a/layouts/shortcodes/list.html b/layouts/shortcodes/list.html deleted file mode 100644 index 1da660d..0000000 --- a/layouts/shortcodes/list.html +++ /dev/null @@ -1,10 +0,0 @@ -
    -
      - {{ range .Params }} -
    • - {{ . }} -
      • - {{ end }} -
    - -
    diff --git a/layouts/shortcodes/social.html b/layouts/shortcodes/social.html index 4629aeb..a1394b4 100644 --- a/layouts/shortcodes/social.html +++ b/layouts/shortcodes/social.html @@ -1,6 +1,6 @@ {{ range .Site.Params.social }}
  • - + {{ .title }} diff --git a/static/css/base.css b/static/css/base.css index e7ddae0..2958a5d 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -174,10 +174,6 @@ hr { justify-content: flex-start; } -.hide { - visibility: hidden; -} - .text-center p { text-align: center; } @@ -189,3 +185,19 @@ hr { .text-right p { text-align: right; } + +/* keeps in the DOM but moves from the page */ +.invisible { + position: absolute; + left: -999em; +} + +/*keeps in the same location and maintains it's layout space even though hidden*/ +.hide { + visibility: hidden; +} + +/*completely removes from DOM */ +.remove { + display: none; +} diff --git a/static/css/page.css b/static/css/page.css index 55a6a2c..3c36165 100644 --- a/static/css/page.css +++ b/static/css/page.css @@ -104,6 +104,7 @@ flex-flow: wrap; align-content: center; justify-content: center; + padding-bottom: 0.5em; } .box--column { @@ -146,6 +147,11 @@ font-size: 3rem; } +.btn--circle { + border-radius: 50%; + padding: 0.5em; +} + .box--avatar > img, img.avatar { object-fit: cover; @@ -169,7 +175,6 @@ img.avatar { } .box__caption { -padding-bottom: .75em; text-transform: capitalize; font-style: italic; } @@ -213,12 +218,25 @@ font-style: italic; code { font-size: 0.8em; - background-color: grey; + font-family: Inconsolata; + background-color: dimgrey; border-radius: 0.2em; color: white; padding-left: 0.2em; padding-right: 0.2em; padding-top: 0.05em; padding-bottom: 0.05em; - +} + +code.hljs { + font-size: .75em; + border-radius: 0.2em; + background-color: dimgrey; + color: white; + padding: 1em; + margin-bottom: 0.7em; + width: inherit; + max-width: 90vw; + border-width: 10px; + border-color: blue; } diff --git a/static/js/docready.js b/static/js/docready.js index 94577f9..46a9a54 100644 --- a/static/js/docready.js +++ b/static/js/docready.js @@ -5,7 +5,7 @@ $(document).ready(function () { heroResize(); itemResize('iframe'); typeResize(); // for section content - + hljs.initHighlightingOnLoad(); // resize elements on change $(window).resize(function () { heroResize(); @@ -13,4 +13,4 @@ $(document).ready(function () { typeResize(); }); -}); +});;