chronik first try

layouts/partials/head.html

@@ -17,8 +17,10 @@
   <link rel="shortcut icon" href="{{ `media/favicon.png` | absURL }}" type="image/x-icon">
   <link rel="icon" href="{{ `media/favicon.png` | absURL }}" type="image/x-icon">
 
+  <script src="{{ `plugins/wordcloud/wordcloud2.js` | absURL }}"></script>
+
   <!-- Matomo -->
-<script>
+  <script>
     var _paq = window._paq = window._paq || [];
     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
     _paq.push(["setDoNotTrack", true]);
@@ -32,16 +34,10 @@
       var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
       g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
     })();
-</script>
+  </script>
-<!-- End Matomo Code -->
+  <!-- End Matomo Code -->
 
-<<<<<<< HEAD
+  {{ template "_internal/opengraph.html" . }}
-{{ template "_internal/opengraph.html" . }}
+  {{ template "_internal/twitter_cards.html" . }}
-{{ template "_internal/twitter_cards.html" . }}
-=======
-<script src="{{ `plugins/wordcloud/wordcloud2.js` | absURL }}"></script>
-
-
->>>>>>> 789501f (chronik first try)
 
 </head>

resources/_gen/assets/scss/scss/style.scss_f120a3f402b106f64b18d498afd3d82e.content

@@ -105,7 +105,7 @@ h6, .h6 {
     background: #ffab08;
     color: #ffbc3b; }
 
-.btn-primary.active:not(:disabled):not(.disabled),
+.btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active,
 .show > .btn-primary.dropdown-toggle {
   color: #fff;