Fixed 404 errors

pacollins · Aug 24, 2019 · 09155a6 · 09155a6
1 parent 81d99d8
commit 09155a6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 35 deletions.
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -874,19 +874,6 @@ textarea {
    clip-path: ellipse(40% 25% at 50% 50%);
  }
 
- /* Flags */
-
- .flag-icon {
-   border: 0.02px solid black;
- }
-
- .flag-icon-en {
-   background-image: url(../flags/4x3/en.svg);
-   &.flag-icon-squared {
-     background-image: url(../flags/1x1/en.svg);
-   }
- }
-
  /* Share Button */
 
  .share-btn {

diff --git a/...pleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.content b/...pleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.content
diff --git a/exampleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.json b/exampleSite/resources/_gen/assets/css/css/bundle.css_d11fe7b62c27961c87ecd0f2490357b9.json
@@ -1 +1 @@
-{"Target":"css/bundle.min.d859cecd49d3659cb48b548a1ca219afd71b7235e4270881b1f6b16d46e19b98.css","MediaType":"text/css","Data":{"Integrity":"sha256-2FnOzUnTZZy0i1SKHKIZr9cbcjXkJwiBsfaxbUbhm5g="}}
+{"Target":"css/bundle.min.a09645c30abf36fe3e508c6f5bb8d8c5d3ff326e58ac0f7077d62c6df63a8788.css","MediaType":"text/css","Data":{"Integrity":"sha256-oJZFwwq/Nv4+UIxvW7jYxdP/Mm5YrA9wd9YsbfY6h4g="}}
diff --git a/...leSite/resources/_gen/assets/scss/scss/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/...leSite/resources/_gen/assets/scss/scss/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
@@ -678,15 +678,6 @@ table {
   -o-clip-path: ellipse(40% 25% at 50% 50%);
   clip-path: ellipse(40% 25% at 50% 50%); }
 
-/* Flags */
-.flag-icon {
-  border: 0.02px solid black; }
-
-.flag-icon-en {
-  background-image: url(../flags/4x3/en.svg); }
-  .flag-icon-en.flag-icon-squared {
-    background-image: url(../flags/1x1/en.svg); }
-
 /* Share Button */
 .share-btn {
   border: none;

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -10,7 +10,7 @@
     {{ if .Site.Params.highlightjs }}<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/styles/{{ .Site.Params.highlightjsTheme | default "default" }}.min.css">{{ end }}
     {{ range .Site.Params.cssFiles }}
       {{ if eq . "default" }}
-        <link rel="stylesheet" href="{{ "css/normalize.css" | relURL}}">
+        <link rel="stylesheet" href="{{ "css/normalize.css" | relURL }}">
         <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700">
         <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/academicons/1.8.6/css/academicons.min.css">
         <link rel="stylesheet" href="//use.fontawesome.com/releases/v5.10.1/css/all.min.css">
@@ -24,16 +24,16 @@
       {{ end }}
     {{ end }}
   {{ else }}
-    {{ if .Site.Params.highlightjs }}<link rel="stylesheet" href="{{ `css/styles/{{ .Site.Params.highlightjsTheme | default "default" }}.css` | relURL}}">{{ end }}
     {{ range .Site.Params.cssFiles }}
       {{ if eq . "default" }}
-        {{ $normalize := resources.Get "css/normalize.css" }}
-        {{ $fonts := resources.Get "css/fonts.css" }}
-        {{ $academicons := resources.Get "css/academicons.css" }}
-        {{ $fontawesome := resources.Get "css/fontawesome.css" }}
-        {{ $fancybox := resources.Get "css/fancybox.css" }}
-        {{ $main := resources.Get "scss/main.scss" | resources.ToCSS }}
-        {{ $css := slice $normalize $fonts $academicons $fontawesome $fancybox $main | resources.Concat "css/bundle.css" | resources.Minify | resources.Fingerprint }}
+        {{ $cssSlice := resources.Match "css/*.css" }}
+        {{ $cssSlice = $cssSlice | append (resources.Get "scss/main.scss" | resources.ToCSS) }}
+        {{ if $.Site.Params.highlightjs }}
+          {{ $hlTh := $.Site.Params.highlightjsTheme | default "default" }}
+          {{ $hlThCSS := printf "css/styles/%s.css" $hlTh }}
+          {{ $cssSlice = $cssSlice | append (resources.Match $hlThCSS) }}
+        {{ end }}
+        {{ $css := $cssSlice | resources.Concat "css/bundle.css" | resources.Minify | resources.Fingerprint }}
         <link rel="stylesheet" href="{{ $css.RelPermalink }}" integrity="{{ $css.Data.Integrity }}">
         <link rel="stylesheet" href="{{ "css/add-on.css" | relURL }}">
       {{ else }}

diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -23,7 +23,8 @@
   {{ end }}
 {{ else }}
   {{ if .Site.Params.highlightjs }}
-    <script src="{{ "js/highlight.pack.js" | relURL }}"></script>
+    {{ $hljs := resources.Get "js/highlight.pack.js" }}
+    <script src="{{ $hljs.RelPermalink }}"></script>
     <script>hljs.initHighlightingOnLoad();</script>
   {{ end }}
   {{ range .Site.Params.jsFiles }}