From 4919cf08170fd86c2af22062f588197eb7dd6d61 Mon Sep 17 00:00:00 2001
From: derv82 <derv82@gmail.com>
Date: Mon, 4 Dec 2017 00:30:06 -0800
Subject: [PATCH] Fixing over-styling in search-results.css

* Right-padding to account for scrollbar when showing search results.
* No 'max-width' anymore -- width adjusts to popup width.
* Description uses ellilpsis on overflow.
  * Still needs info/expando (and need to remove title-text)
* Screenshots have 'object-fit:cover' to fill the space.

Unrelated: Hack for search category 'userstyles' (should be userstyles.org)
---
 popup/search-results.css | 43 ++++++++++++----------------------------
 popup/search-results.js  | 25 ++++++++++++++---------
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/popup/search-results.css b/popup/search-results.css
index 363a19e0..de981209 100755
--- a/popup/search-results.css
+++ b/popup/search-results.css
@@ -1,6 +1,7 @@
 body.search-results-shown {
   overflow-y: auto;
   overflow-x: hidden;
+  padding-right: 20px;
 }
 
 #disable-all-wrapper {
@@ -8,11 +9,6 @@ body.search-results-shown {
   margin-bottom: 5px;
 }
 
-#searchResults,
-#find-styles {
-  display: block;
-}
-
 .hidden {
   display: none !important;
 }
@@ -25,11 +21,6 @@ body.search-results-shown {
   margin-right: 20px;
 }
 
-#searchResults, #searchResults-list {
-  max-width: 200px;
-  overflow: hidden;
-}
-
 .searchResult {
   padding: 5px;
 }
@@ -37,17 +28,14 @@ body.search-results-shown {
   background-color: rgba(50, 150, 255, 0.5);
 }
 .searchResult.loading {
+  background-color: rgba(90, 90, 90, 0.5);
   opacity: 0.5;
 }
 
-.searchResult img {
-  display: block;
-  max-width: 180px;
-  max-height: 180px;
-}
-.searchResult-screenshot.no-screenshot {
-  width: 180px;
-  height: 40px;
+.searchResult-screenshot {
+  max-height: 120px;
+  width: 100%;
+  object-fit: cover;
 }
 
 .searchResult-title {
@@ -56,13 +44,9 @@ body.search-results-shown {
 }
 
 .searchResult-description {
-  overflow: hidden;
-  font-style: italic;
-}
-
-.searchResult > * {
-  overflow-x: hidden;
   white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .searchResult-author {
@@ -76,6 +60,7 @@ body.search-results-shown {
 
 .searchResult-metaRating, .searchResult-metaInstallCount {
   display: table-cell;
+  text-align: center;
 }
 
 .searchResult-rating {
@@ -96,6 +81,10 @@ body.search-results-shown {
   background-color: #333;
 }
 
+.searchResult-installCount {
+  font-weight: 600;
+}
+
 .searchResult-install {
   width: 100%;
 }
@@ -122,9 +111,3 @@ body.search-results-shown {
 #searchResultsNav button {
   text-align: center;
 }
-
-#searchResultsNav-prev[disabled],
-#searchResultsNav-next[disabled] {
-  cursor: not-allowed;
-  background-image: linear-gradient(rgba(90, 90, 90, 0.5), rgba(90, 90, 90, 0.5));
-}
diff --git a/popup/search-results.js b/popup/search-results.js
index 3b45a8e4..143b8c41 100755
--- a/popup/search-results.js
+++ b/popup/search-results.js
@@ -14,12 +14,8 @@
           $('#find-styles-inline').checked = false;
 
           const searchResults = searchResultsController();
-          $('#searchResultsNav-prev').onclick = searchResults.prev;
-          $('#searchResultsNav-next').onclick = searchResults.next;
+          searchResults.init();
           searchResults.load();
-          document.body.classList.add('search-results-shown');
-
-          window.scrollTo(0, 0);
 
           // Avoid propagating click to anchor/href
           event.preventDefault();
@@ -43,13 +39,21 @@
     const unprocessedResults = []; // Search results not yet processed.
     const processedResults = []; // Search results that are not installed and apply ot the page (includes 'json' field with full style).
     const BLANK_PIXEL_DATA = 'data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAA' +
-                            'C1HAwCAAAAC0lEQVR42mOcXQ8AAbsBHLLDr5MAAAAASUVORK5CYII=';
+                             'C1HAwCAAAAC0lEQVR42mOcXQ8AAbsBHLLDr5MAAAAASUVORK5CYII=';
     let loading = false;
     let tabURL; // The active tab's URL.
     let category; // Category for the active tab's URL.
     let currentDisplayedPage = 1; // Current page number in popup.html
 
-    return {load, next, prev};
+    return {init, load, next, prev};
+
+    function init() {
+      $('#searchResultsNav-prev').onclick = prev;
+      $('#searchResultsNav-next').onclick = next;
+      document.body.classList.add('search-results-shown');
+      window.scrollTo(0, 0);
+      load();
+    }
 
     function render() {
       $('#searchResults-list').textContent = ''; // Clear search results
@@ -440,8 +444,11 @@ function searchUserstyles() {
       return 'STYLUS'; // Stylus page
     } else {
       // Website address, strip TLD & subdomain
-      const domainRegex = /^www\.|(\.com?)?\.\w+$/g;
-      return u.hostname.replace(domainRegex, '').split('.').pop();
+      let domain = u.hostname.replace(/^www\.|(\.com?)?\.\w+$/g, '').split('.').pop();
+      if (domain === 'userstyles') {
+        domain = 'userstyles.org';
+      }
+      return domain;
     }
   }