chronik first try

layouts/partials/head.html

@@ -17,6 +17,8 @@
   <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>
     var _paq = window._paq = window._paq || [];
@@ -35,13 +37,7 @@
   </script>
   <!-- End Matomo Code -->
 
-<<<<<<< HEAD
   {{ template "_internal/opengraph.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;