From 0390dcb0208d69091f7e0c0efcb152699e0f9c6b Mon Sep 17 00:00:00 2001 From: Thibaud Lepretre Date: Sat, 31 Jul 2021 09:34:15 +0200 Subject: Update dependencies - [ ] Highlight is broken since latest highlight js update --- exampleSite/config.toml | 28 ++++++++++++++-------------- layouts/partials/head.html | 6 ++---- layouts/partials/script.html | 10 +++++----- src/scss/utils/_fonts.scss | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 55 insertions(+), 24 deletions(-) diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 16d56e0..a805883 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -207,50 +207,50 @@ canonifyurls = true # [[params.customJS]] # src = "js/myscript.js" [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/go.min.js" - integrity = "sha256-LVuWfOU0rWFMCJNl1xb3K2HSWfxtK4IPbqEerP1P83M=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/go.min.js" + integrity = "sha512-EWROca+bote+7Oaaar1F6y74iZj1r1F9rm/ly7o+/FwJopbBaWtsFDmaKoZDd3QiGU2pGacBirHJNivmGLYrow==" crossorigin = "anonymous" async = true defer = true [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/less.min.js" - integrity = "sha256-EB4Qe5B8kOTN9/r65YrBPJ3VkDRJa8sSVqqaIakt0gU=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/less.min.js" + integrity = "sha512-UgZlma8NzkrDb/NWgmLIcTrH7i/CSnLLDRFqCSNF5NGPpjKmzyM25qcoXGOup8+cDakKyaiTDd7N4dyH4YT+IA==" crossorigin = "anonymous" async = true defer = true [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/puppet.min.js" - integrity = "sha256-LWiDV1Ge/4ULbV/tJh9N8NTILGIbsPEdnGQ24CrjBzo=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/puppet.min.js" + integrity = "sha512-Zd3e7XxHP00TD0Imr0PIfeM0fl0v95kMWuhyAS3Wn1UTSXTkz0OhtRgBAr4JlmADRgiXr4x7lpeUdqaGN8xIog==" crossorigin = "anonymous" async = true defer = true [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scss.min.js" - integrity = "sha256-/27cA5aA9DgzXPb747VxVTzwPG/X5tihoKySMSq3bwk=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/scss.min.js" + integrity = "sha512-qtqDO052iXMSP+5d/aE/jMtL9vIIGvONgTJziC2K/ZIB1yEGa55WVxGE9/08rSQ62EoDifS9SWVGZ7ihSLhzMA==" crossorigin = "anonymous" async = true defer = true [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/stylus.min.js" - integrity = "sha256-CFwICvPAUcOBI6YRYZMf4OkyePvFtdG7n7Wl9UNZwx0=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/stylus.min.js" + integrity = "sha512-1NmkjnEDnwwwcu28KoQF8vs3oaPFokQHbmbtwGhFfeDsQZtVFI8zW2aE9O8yMYdpdyKV/5blE4pSWw4Z/Sv97w==" crossorigin = "anonymous" async = true defer = true [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/swift.min.js" - integrity = "sha256-zYofLVsdq2KkS4cVGc6/8gTKb7lPsTLk1vs37g9aYj0=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/swift.min.js" + integrity = "sha512-B2wSfruPjr8EJL6IIzQr1eAuDwrsfIfccNf/LCEdxELCgC/S/ZMt/Uvk80aD79m7IqOqW+Sw8nbkvha20yZpzg==" crossorigin = "anonymous" async = true defer = true [[params.customJS]] - src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/yaml.min.js" - integrity = "sha256-tvm0lHsuUZcOfj/0C9xJTU4OQx5KpUgxUcAXLX5kvwA=" + src = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.1.0/languages/yaml.min.js" + integrity = "sha512-28oDiQZGKUVN6wQ7PSLPNipOcmkCALXKwOi7bnkyFf8QiMZQxG9EQoy/iiNx6Zxj2cG2SbVa4dXKigQhu7GiFw==" crossorigin = "anonymous" async = true defer = true diff --git a/layouts/partials/head.html b/layouts/partials/head.html index dcb09bb..f997548 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -42,14 +42,12 @@ - - - {{ if .Site.Params.comment.gitalk.enable }} + {{ if .Site.Params.comment.gitalk.enable }} {{ end }} - + {{ range .Site.Params.customCSS }} {{ if isset . "href" }} diff --git a/layouts/partials/script.html b/layouts/partials/script.html index f51b31d..13ecc4b 100644 --- a/layouts/partials/script.html +++ b/layouts/partials/script.html @@ -1,14 +1,14 @@ - + {{ if eq .Site.Params.syntaxHighlighter "highlight.js" }} - + {{ else if eq .Site.Params.syntaxHighlighter "prism.js" }} - + {{ end }} - + - + {{ range .Site.Params.customJS }} {{ if isset . "src" }} diff --git a/src/scss/utils/_fonts.scss b/src/scss/utils/_fonts.scss index 6ae113f..9047a9e 100755 --- a/src/scss/utils/_fonts.scss +++ b/src/scss/utils/_fonts.scss @@ -12,4 +12,37 @@ src: local('Open Sans Bold'), local('OpenSans-Bold'), url(https://fonts.gstatic.com/s/opensans/v10/k3k702ZOKiLJc3WVjuplzJS3E-kSBmtLoNJPDtbj2Pk.ttf) format('truetype'); } -@import url('https://fonts.googleapis.com/css?family=Merriweather:300,300i,400,700,700i&subset=cyrillic,cyrillic-ext,latin-ext'); \ No newline at end of file +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 300; + src: local('Merriweather Light'), local('Merriweather-Light'), url(https://fonts.gstatic.com/s/merriweather/v8/ZvcMqxEwPfh2qDWBPxn6nk7nEl83IKQRaQwpv_tz1Eg.ttf) format('truetype'); +} + +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 400; + src: local('Merriweather'), url(https://fonts.gstatic.com/s/merriweather/v8/RFda8w1V0eDZheqfcyQ4EJS3E-kSBmtLoNJPDtbj2Pk.ttf) format('truetype'); +} + +@font-face { + font-family: 'Merriweather'; + font-style: normal; + font-weight: 700; + src: local('Merriweather Bold'), local('Merriweather-Bold'), url(https://fonts.gstatic.com/s/merriweather/v8/ZvcMqxEwPfh2qDWBPxn6nv83cGrqhiQgWmjXfohD0fc.ttf) format('truetype'); +} + +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 300; + src: local('Merriweather Light Italic'), local('Merriweather-LightItalic'), url(https://fonts.gstatic.com/s/merriweather/v8/EYh7Vl4ywhowqULgRdYwIGrKw6K5wsYdxr6rUL2ZGaM.ttf) format('truetype'); +} + +@font-face { + font-family: 'Merriweather'; + font-style: italic; + font-weight: 700; + src: local('Merriweather Bold Italic'), local('Merriweather-BoldItalic'), url(https://fonts.gstatic.com/s/merriweather/v8/EYh7Vl4ywhowqULgRdYwII1kRdeHIFWYEsp6A2f99b0.ttf) format('truetype'); +} \ No newline at end of file -- cgit v1.2.3