Merge pull request #293 from salcido/remove-compact-collection

Remove Compact Collection Feature

css/dark-theme.scss

@@ -5089,12 +5089,21 @@
     }
 
     [class*="ctaButtonContainer_"] [class*="ctaButton"] {
-      color: var(--text-bold) !important;
+      color: var(--button-disabled-text) !important;
       border: 1px solid var(--borders) !important;
       background: var(--input-bg) !important;
 
+      [class*="_buttonContent_"] {
+        color: var(--button-disabled-text) !important;
+      }
+
       &:hover {
         background: var(--black) !important;
+        color: var(--text-bold) !important;
+
+        [class*="_buttonContent_"] {
+          color: var(--text-bold) !important;
+        }
       }
     }
 
@@ -5901,8 +5910,11 @@
   }
 
   [class*="searchBarContainer_"] {
-    background: var(--input-bg) !important;
-    border: 1px solid var(--borders) !important;
+    [class*="searchBarInput_"] {
+      background: var(--input-bg) !important;
+      border: 1px solid var(--borders) !important;
+    }
+
 
     form label input[type="text"] {
       border: none !important;

html/learn.html

@@ -213,17 +213,6 @@ <h2 id="compactArtist">Compact Artist & Label Pages</h2>
       <figcaption>Feature enabled</figcaption>
     </div>
 
-    <!-- Compact Collection Header -->
-    <div class="feature-block">
-      <h2 id="compactCollection">Compact Collection Page</h2>
-      <p>Reduces the overall white space in the header section of the Collection page, removes the top pagination navigation links, reduces font sizes, and moves some UI elements around in order to mimic the old Collection page layout.</p>
-
-      <img src="../img/learn/compact-collection-before.jpg" class="max-width" />
-      <figcaption>Default Layout</figcaption>
-      <img src="../img/learn/compact-collection-after.jpg" class="max-width mt-3" />
-      <figcaption>Feature enabled</figcaption>
-    </div>
-
     <!-- Confirm Before Removing Items -->
     <div class="feature-block">
       <h2 id="confirm-before-removing">Confirm Before Removing Items</h2>

html/popup.html

@@ -148,30 +148,6 @@ <h2>&#x1F44B; Heads up!</h2>
       </div> <!-- /.help -->
     </div>
 
-    <!-- Compact Collection -->
-    <div class="toggle-group">
-      <p class="label">Compact Collection Page</p>
-      <div class="meta hide">Compact Collection Pages header white space size smaller</div>
-
-      <div class="onoffswitch">
-        <input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="toggleCompactCollection" checked>
-        <label class="onoffswitch-label" for="toggleCompactCollection">
-          <span class="onoffswitch-inner"></span>
-          <span class="onoffswitch-switch"></span>
-        </label>
-      </div>
-
-      <div class="help compactCollection">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-help-circle" color="#384047"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12" y2="17"></line></svg>
-        <div class="help-bubble">
-          <div class="help-text">
-            Reduces the white space, font sizes, and rearranges UI elements on the Collection header.
-          </div>
-          <div class="arrow-right stroke"></div><div class="arrow-right"></div>
-        </div>
-      </div> <!-- /.help -->
-    </div>
-
     <!-- Confirm before removing -->
     <div class="toggle-group">
       <p class="label">Confirm Before Removing Items</p>

js/extension/background.js

@@ -24,7 +24,6 @@ let prefs = {
   confirmBeforeRemoving: false,
   collectionBoxFix: false,
   compactArtist: false,
-  compactCollection: false,
   converter: true,
   darkTheme: false,
   darkThemeVariant: '',

js/extension/user-preferences.js

@@ -492,17 +492,6 @@ appendFragment([resourceLibrary])
         elems.push(blockSellers_css);
       }
 
-      if (prefs.compactCollection) {
-
-        let compactCollection = document.createElement('script');
-
-        compactCollection.type = 'text/javascript';
-        compactCollection.src = chrome.runtime.getURL('js/extension/features/compact-collection-header.js');
-        compactCollection.className = 'de-init';
-
-        elems.push(compactCollection);
-      }
-
       if (prefs.confirmBeforeRemoving) {
 
         let confirmBeforeRemoving = document.createElement('script');

js/popup/change-log.js

@@ -1,18 +1,10 @@
 module.exports = {
   current: [
     {
-      features: [{
-        name: 'Compact Collection Page',
-        description: 'Reduces the white space, font sizes, and rearranges UI elements on the Collection header in order to mimic the old Collection page.',
-        link: '#compactCollection'
-      }],
+      features: [],
       removedFeatures: [{
-        name: 'Everlasting Collection',
-        description: 'Everlasting Collection has been removed since it\'s incompatible with the new Collection page.',
-      },
-      {
-        name: 'Improved Collection UI',
-        description: 'Improved Collection UI has been removed since it\'s incompatible with the new Collection page.',
+        name: 'Compact Collection Page',
+        description: 'This feature is no longer needed since Discogs has fixed the Collection page layout!',
       }],
       updates: [
         {

js/popup/popup-logic/popup.js

@@ -79,7 +79,6 @@ window.addEventListener('load', () => {
       toggleBlockBuyers = document.getElementById('toggleBlockBuyers'),
       toggleBlockSellers = document.getElementById('toggleBlockSellers'),
       toggleCompactArtist = document.getElementById('toggleCompactArtist'),
-      toggleCompactCollection = document.getElementById('toggleCompactCollection'),
       toggleCollectionBoxFix = document.getElementById('toggleCollectionBoxFix'),
       toggleConfirmBeforeRemoving = document.getElementById('toggleConfirmBeforeRemoving'),
       toggleConverter = document.getElementById('toggleConverter'),
@@ -275,7 +274,6 @@ window.addEventListener('load', () => {
   toggleBlockBuyers.addEventListener('change', triggerSave);
   toggleBlockSellers.addEventListener('change', triggerSave);
   toggleCompactArtist.addEventListener('change', compactArtist.toggleCompactArtist);
-  toggleCompactCollection.addEventListener('change', triggerSave);
   toggleCollectionBoxFix.addEventListener('change', triggerSave);
   toggleConfirmBeforeRemoving.addEventListener('change', triggerSave);
   toggleConverter.addEventListener('change', triggerSave);
@@ -462,7 +460,6 @@ window.addEventListener('load', () => {
       toggleBlockSellers.checked = prefs.blockSellers;
       toggleCollectionBoxFix.checked = prefs.collectionBoxFix;
       toggleCompactArtist.checked = prefs.compactArtist;
-      toggleCompactCollection.checked = prefs.compactCollection;
       toggleConfirmBeforeRemoving.checked = prefs.confirmBeforeRemoving;
       toggleConverter.checked = prefs.converter;
       toggleDarkTheme.checked = prefs.darkTheme;

js/popup/popup-logic/utils.js

@@ -43,7 +43,6 @@ export function applySave(message, event, currencyTarget = 'currency') {
         blockSellers: document.getElementById('toggleBlockSellers').checked,
         collectionBoxFix: document.getElementById('toggleCollectionBoxFix').checked,
         compactArtist: document.getElementById('toggleCompactArtist').checked,
-        compactCollection: document.getElementById('toggleCompactCollection').checked,
         confirmBeforeRemoving: document.getElementById('toggleConfirmBeforeRemoving').checked,
         converter: document.getElementById('toggleConverter').checked,
         darkTheme: document.getElementById('toggleDarkTheme').checked,

manifest.json

@@ -3,7 +3,7 @@
   "name": "Discogs Enhancer",
   "short_name": "Discogs Enhancer",
   "description": "Adds a dark theme, block sellers, price comparisons, currency converter, configurable quick search, & more to Discogs!",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "author": "Matthew Salcido",
   "homepage_url": "https://www.discogs-enhancer.com",
   "action": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discogs-enhancer",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "A Chrome extension that adds useful functionality to Discogs.com! https://www.discogs-enhancer.com",
   "main": "index.js",
   "scripts": {