Merge pull request #241 from salcido/dual-header-functionality

Dual header functionality
salcido · Jun 15, 2023 · 00f8562 · 00f8562
2 parents 0d308f2 + c26f581
commit 00f8562
Show file tree

Hide file tree

Showing 16 changed files with 1,020 additions and 53 deletions.
diff --git a/css/dark-theme.scss b/css/dark-theme.scss
@@ -163,6 +163,7 @@
   --demand-negative: #ff6c6c;
   --blocked-seller: #d64c4c;
   --icon-green: #5ec93b;
+  --icon-disabled: #666666;
 }
 /*
 ////////////////////////////////////
@@ -4978,6 +4979,33 @@
           }
         }
       }
+
+      // Release Recommendations
+      figure[class*="_card"] {
+        border-color: var(--borders) !important;
+      }
+      figcaption {
+        div[class*="_concatenatedLinks"] span a {
+          color: var(--text-muted) !important;
+        }
+        div[class*="_released"] span {
+          color: var(--text-muted) !important;
+        }
+        div[class*="_format"] {
+          border-top: 1px solid var(--borders) !important;
+        }
+        div[class*="_format"] svg path {
+          fill: var(--text-muted) !important;
+        }
+      }
+      div[class*="_paginationButtons"] {
+        button[disabled] {
+          cursor: default;
+          svg path {
+            fill: var(--icon-disabled) !important;
+          }
+        }
+      }
     }
 
     button[type="submit"][class*="grey_"] {

diff --git a/css/feedback-notifier.css b/css/feedback-notifier.css
@@ -34,6 +34,18 @@
   display: block;
 }
 
+/* DELETE IN THE FUTURE */
+nav[class*="profile_"] #de-seller-feedback .de-seller-feedback .skittle.skittle_collection,
+nav[class*="profile_"] #de-buyer-feedback .de-buyer-feedback .skittle.skittle_collection {
+  padding: .2rem .4rem;
+}
+
+nav[class*="_user_"] #de-seller-feedback .de-seller-feedback .skittle.skittle_collection,
+nav[class*="_user_"] #de-buyer-feedback .de-buyer-feedback .skittle.skittle_collection {
+  padding: .2rem .4rem;
+}
+/* END DELETE IN THE FUTURE */
+
 .de-seller-feedback .badge span.count:after {
   content: "S";
 }
@@ -51,6 +63,26 @@ nav[class*="_user_"] a.de-buyer-feedback {
   padding: 2rem 0rem;
 }
 
+/* DELETE IN THE FUTURE */
+
+nav[class*="profile_"] a.de-seller-feedback {
+  padding: 2rem 0rem;
+}
+
+nav[class*="profile_"] a.de-buyer-feedback {
+  padding: 2rem 0rem;
+}
+
+nav[class*="profile_"] .de-badge {
+  margin: 1rem .5rem;
+}
+
+nav[class*="profile_"] .feedback-chart {
+  margin-top: 1.5rem;
+}
+
+/* END DELETE IN THE FUTURE */
+
 .de-buyer-feedback .badge,
 .de-buyer-feedback .badge span.count {
   background: #FF6A23 !important;

diff --git a/html/learn.html b/html/learn.html
@@ -911,6 +911,7 @@ <h2 id="thanks">Thank You</h2>
         <li class="donor">@bradykimball</li>
         <li class="donor">Chance W.</li>
         <li class="donor">Charlie G.</li>
+        <li class="donor">Chris E.</li>
         <li>Christian B.</li>
         <li class="donor">Christoph W.</li>
         <li class="donor">Christy D.</li>
@@ -951,6 +952,7 @@ <h2 id="thanks">Thank You</h2>
         <li>Lucas F.</li>
         <li class="donor">Lukas A.</li>
         <li class="donor">Łukasz P.</li>
+        <li class="donor">Mania R.</li>
         <li class="donor">Marc van K.</li>
         <li class="donor">Marcel K.</li>
         <li class="donor">Mark A. <span style="color: #fff;">&#9733;</span> <span style="color: #fff;">&#9733;</span></li>
@@ -975,6 +977,7 @@ <h2 id="thanks">Thank You</h2>
         <li class="donor">Ritesh K.</li>
         <li>RollingStone1989</li>
         <li class="donor">Robert P.</li>
+        <li class="donor">Robert W.</li>
         <li class="donor">Roman G.</li>
         <li class="donor">Rosalyn R.</li>
         <li>Salvatore C.</li>
@@ -993,6 +996,7 @@ <h2 id="thanks">Thank You</h2>
         <li class="donor">Tobias B.</li>
         <li class="donor">Transferwise</li>
         <li class="donor">Willem</li>
+        <li class="donor">William B.</li>
         <li class="donor">Wolf <span style="color: #fff;">&#9733;</span></li>
         <li class="donor">Zack W.</li>
         <li class="donor">zebrazoly</li>

diff --git a/js/extension/dependencies/resource-library.js b/js/extension/dependencies/resource-library.js
@@ -50,8 +50,12 @@
                      'cursor: pointer;';
 
       notice.textContent = message;
+      //TODO: delete this when the header shit is settled
+      let selector = document.querySelector('#site_headers_super_wrap')
+                      ? '#site_headers_super_wrap'
+                      : 'div[id*="__header_"]';
 
-      document.querySelector('div[id*="__header_"]').appendChild(notice);
+      document.querySelector(selector).appendChild(notice);
       document.getElementById('deAlertNotice').addEventListener('click', function() { this.remove(); });
 
       setTimeout(() => {

diff --git a/js/extension/features/block-buyers.js b/js/extension/features/block-buyers.js
@@ -126,6 +126,10 @@ rl.ready(() => {
    * @returns {undefined}
    */
   function successMsg(buyer) {
+    //TODO: delete this when the header shit is settled
+    let selector = document.querySelector('#site_header_wrap')
+                    ? '#site_header_wrap'
+                    : 'div[id*="__header_"]';
     let banner,
         btn = document.querySelector('.de-block-buyer');
 
@@ -140,14 +144,19 @@ rl.ready(() => {
                   </span>
                 </div>
               </div>`;
-    document.querySelector('div[id*="__header_"]').insertAdjacentHTML('beforeend', banner);
+    document.querySelector(selector).insertAdjacentHTML('beforeend', banner);
   }
 
   /**
    * Display an error message to the user.
    * @returns {undefined}
    */
   function errorMsg() {
+    //TODO: delete this when the header shit is settled
+    let selector = document.querySelector('#site_header_wrap')
+                    ? '#site_header_wrap'
+                    : 'div[id*="__header_"]';
+
     let banner = `<div class="alert-message alert-message-js alert-message-error alert-message-top">
                     <div class="alert-message-content" style="max-width: none;">
                       <i class="icon icon-exclamation-triangle alert-message-icon"></i>
@@ -156,7 +165,7 @@ rl.ready(() => {
                       </span>
                     </div>
                   </div>`;
-    document.querySelector('div[id*="__header_"]').insertAdjacentHTML('beforeend', banner);
+    document.querySelector(selector).insertAdjacentHTML('beforeend', banner);
   }
 
   // ========================================================