Merge pull request 'update to latest on 2024.02.18' (#13) from 2023_02_18 into main

Reviewed-on: #13
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>

README.md

@@ -23,7 +23,7 @@ All changes done to the the templates do not require compilation, only searxng r
 When changing static elements (css, images etc), edit files in `src/`. Once done run `grunt` to compile. To do so, in your running searxng instance, your first need to:
 ```
 curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
-source ~/.profile
+source ~/.profile or ~/.bashrc
 nvm install 18.16.0 # or whatever version you want
 npm install -g npm
 cd searx/static/themes/beetroot

beetroot_static/package.json

@@ -14,7 +14,7 @@
     "ionicons": "^7.1.0",
     "less": "^4.1.3",
     "less-plugin-clean-css": "^1.5.1",
-    "sharp": "^0.32.0",
+    "sharp": "^0.33.0",
     "stylelint": "^13.13.1",
     "stylelint-config-standard": "^22.0.0",
     "ejs": "^3.1.8",

beetroot_static/src/generated/pygments.less

@@ -1,6 +1,6 @@
 /*
    this file is generated automatically by searxng_extra/update/update_pygments.py
-   using pygments version 2.16.1
+   using pygments version 2.17.2
 */
 
 

beetroot_static/src/js/main/preferences.js

@@ -26,5 +26,12 @@
     for (const el of d.querySelectorAll('[data-engine-name]')) {
       searxng.on(el, 'mouseenter', load_engine_descriptions);
     }
+
+    const copyHashButton = d.querySelector("#copy-hash");
+    searxng.on(copyHashButton, 'click', (e) => {
+      e.preventDefault();
+      navigator.clipboard.writeText(copyHashButton.dataset.hash);
+      copyHashButton.innerText = copyHashButton.dataset.copiedText;
+    });
   });
 })(window, document, window.searxng);

beetroot_static/src/js/main/results.js

@@ -92,8 +92,14 @@
       e.preventDefault();
       searxng.closeDetail();
     });
-    searxng.on('.result-detail-previous', 'click', e => searxng.selectPrevious(false));
-    searxng.on('.result-detail-next', 'click', e => searxng.selectNext(false));
+    searxng.on('.result-detail-previous', 'click', e => {
+      e.preventDefault();
+      searxng.selectPrevious(false)
+    });
+    searxng.on('.result-detail-next', 'click', e => {
+      e.preventDefault();
+      searxng.selectNext(false);
+    });
 
     w.addEventListener('scroll', function () {
       var e = d.getElementById('backToTop'),

beetroot_static/src/less/detail.less

@@ -89,6 +89,7 @@ article.result-images .detail {
     p.result-url {
       white-space: nowrap;
       overflow-x: hidden;
+      overflow-y: hidden;
       text-overflow: ellipsis;
     }
 

beetroot_static/src/less/disroot.less

@@ -73,16 +73,15 @@
 }
 @results-margin: 0.325rem;
 
- // Category color
- //.category label {
- //  color: var(--color-btn-font);
- //}
- 
- button.category_button {
+// Category color
+//.category label {
+//  color: var(--color-btn-font);
+//}
+
+button.category_button {
   color: var(--color-btn-font);
 }
 
-
 // Navbar links in right corner only on results page
 // (needed when using disroot color as navbar background)
 .results_endpoint #links_on_top a,
@@ -190,4 +189,4 @@
   &:hover {
     filter: grayscale(1);
   }
-}
+}

beetroot_static/src/less/preferences.less

@@ -33,6 +33,21 @@ table {
     width: 300px;
   }
 
+  input[type="text"] {
+    width: 13.25rem;
+    color: var(--color-toolkit-input-text-font);
+    border: none;
+    background: none repeat scroll 0 0 var(--color-toolkit-select-background);
+    padding: 0.2rem 0.4rem;
+    height: 2rem;
+    .rounded-corners-tiny;
+
+    &:hover,
+    &:focus {
+      background-color: var(--color-toolkit-select-background-hover);
+    }
+  }
+
   .value {
     margin: 0;
     padding: 0;
@@ -52,21 +67,6 @@ table {
       width: 14rem;
     }
 
-    input[type="text"] {
-      width: 13.25rem;
-      color: var(--color-toolkit-input-text-font);
-      border: none;
-      background: none repeat scroll 0 0 var(--color-toolkit-select-background);
-      padding: 0.2rem 0.4rem;
-      height: 2rem;
-      .rounded-corners-tiny;
-
-      &:hover,
-      &:focus {
-        background-color: var(--color-toolkit-select-background-hover);
-      }
-    }
-
     select:focus,
     input:focus {
       outline: none;
@@ -190,6 +190,23 @@ table {
       width: 100%;
     }
   }
+
+  #copy-hash-container {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+
+    div.selectable_url {
+      pre {
+        width: auto;
+        flex-grow: 1;
+      }
+    }
+  }
+
+  #pref-hash-input {
+    width: 100%;
+  }
 }
 
 @media screen and (max-width: @tablet) {

beetroot_static/src/less/style.less

@@ -112,7 +112,8 @@ footer {
 }
 
 input[type="submit"],
-#results button[type="submit"] {
+#results button[type="submit"],
+.button {
   padding: 0.7rem;
   display: inline-block;
   background: var(--color-btn-background);
@@ -198,7 +199,8 @@ article[data-vim-selected].category-social {
 
   .cache_link,
   .proxyfied_link {
-    font-size: 0.9em !important;
+    font-size: smaller !important;
+    margin-left: 0.5rem;
   }
 
   .content,
@@ -442,6 +444,7 @@ article[data-vim-selected].category-social {
 
   & > a {
     position: relative;
+    outline: none;
   }
 
   img {
@@ -903,7 +906,7 @@ summary.title {
       display: flex;
       flex-wrap: wrap;
       justify-content: flex-end;
-      padding: 0 0 3px 0;
+      padding: 3px 0 0 0;
     }
   }
 

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "searxng-beetroot",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}