Swap theme icons

.eslintignore

@@ -0,0 +1,2 @@
+dist/
+node_modules/

index.html

@@ -36,14 +36,32 @@
     <!-- Theme detection script - runs before Vue loads to prevent flash of unstyled content -->
     <script>
       (function() {
-        // Check for saved theme preference or system preference
+        // Check for saved theme preference only
         const savedTheme = localStorage.getItem('theme');
+        if (!savedTheme) {
+          return; // Let Vue handle default theme
+        }
+        
         const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-        const theme = savedTheme || (prefersDark ? 'dark' : 'light');
+        let theme = savedTheme;
+        
+        // Handle 'auto' theme preference
+        if (theme === 'auto') {
+          theme = prefersDark ? 'dark' : 'light';
+        }
         
         // Apply theme to html element
         document.documentElement.setAttribute('data-bs-theme', theme);
         document.documentElement.setAttribute('data-theme', theme);
+        
+        // Apply theme classes
+        if (theme === 'dark') {
+          document.documentElement.classList.add('dark-theme');
+          document.documentElement.classList.remove('light-theme');
+        } else {
+          document.documentElement.classList.add('light-theme');
+          document.documentElement.classList.remove('dark-theme');
+        }
       })();
     </script>
   </head>

src/App.vue

@@ -3,156 +3,178 @@ import axios from "axios";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 
-import "vue-loading-overlay/dist/css/index.css";
 import "./theme.css";
 
-// Configure day.js with UTC support
 dayjs.extend(utc);
 
 export default {
   data() {
     return {
-      ascending: this.ascending,
-      filter: window.location.href.split("filter=")[1] || "",
-      sortColumn: this.sortColumn,
+      filter: decodeURIComponent(window.location.href.split("filter=")[1] || ""),
+      sortMethod: "score",
       topics: [],
       isMobile: false,
-      currentTheme: 'auto',
-      mediaQueryListener: null,
-      vuetifyTheme: null,
+      currentTheme: "auto",
       darkModeQuery: null,
       themeChangeHandler: null,
     };
   },
+
   mounted() {
     window.addEventListener("keydown", this.handleKeyDown);
+    window.addEventListener("resize", this.handleResize);
     this.detectMobile();
     this.fetchDeals();
-    // Initialize theme on next tick
-    this.$nextTick(() => {
-      this.initializeTheme();
-      this.setupThemeListener();
-    });
+    this.initializeSortMethod();
+    this.initializeTheme();
+    this.setupThemeListener();
   },
+
   beforeUnmount() {
     window.removeEventListener("keydown", this.handleKeyDown);
-    window.removeEventListener("resize", this.detectMobile);
+    window.removeEventListener("resize", this.handleResize);
     if (this.darkModeQuery && this.themeChangeHandler) {
-      this.darkModeQuery.removeEventListener('change', this.themeChangeHandler);
+      this.darkModeQuery.removeEventListener("change", this.themeChangeHandler);
     }
   },
-  methods: {
-    initializeTheme() {
-      // If no saved preference, default to auto
-      const savedTheme = localStorage.getItem('theme');
-      if (!savedTheme) {
-        this.currentTheme = 'auto';
-        this.applyTheme('auto');
-      } else {
-        this.currentTheme = savedTheme;
-        // Apply saved theme
-        this.applyTheme(savedTheme);
-      }
+
+  computed: {
+    filteredTopics() {
+      const filterTerm = this.filter.toLowerCase();
+
+      const filtered = this.topics.filter((row) => {
+        const searchText = `${row.title} [${row.Offer.dealer_name}]`.toLowerCase();
+        return searchText.includes(filterTerm);
+      });
+
+      const sortFns = {
+        score: (a, b) => b.score - a.score,
+        views: (a, b) => b.total_views - a.total_views,
+        recency: (a, b) => new Date(b.last_post_time) - new Date(a.last_post_time),
+      };
+
+      return filtered.sort(sortFns[this.sortMethod] || sortFns.score);
     },
+
+    themeIcon() {
+      const icons = { auto: "brightness_auto", dark: "dark_mode", light: "light_mode" };
+      return icons[this.currentTheme];
+    },
+
+    themeTitle() {
+      const titles = {
+        auto: "Theme: Auto (click for Light)",
+        light: "Theme: Light (click for Dark)",
+        dark: "Theme: Dark (click for Auto)",
+      };
+      return titles[this.currentTheme];
+    },
+
+    sortIcon() {
+      const icons = { score: "trending_up", views: "visibility", recency: "schedule" };
+      return icons[this.sortMethod];
+    },
+
+    sortTitle() {
+      const titles = {
+        score: "Sort by Score (click for Views)",
+        views: "Sort by Views (click for Recency)",
+        recency: "Sort by Recency (click for Score)",
+      };
+      return titles[this.sortMethod];
+    },
+  },
+
+  methods: {
+    formatDate(dateString) {
+      return dayjs(String(dateString)).format("YYYY-MM-DD hh:mm A");
+    },
+
+    highlightText(text) {
+      if (!this.filter) return text;
+
+      const lowerText = text.toLowerCase();
+      const lowerFilter = this.filter.toLowerCase();
+
+      if (!lowerText.includes(lowerFilter)) return text;
+
+      const regex = new RegExp(this.filter, "ig");
+      return text.replace(regex, (match) => `<mark>${match}</mark>`);
+    },
+
+    initializeTheme() {
+      const savedTheme = localStorage.getItem("theme") || "auto";
+      this.currentTheme = savedTheme;
+      this.applyTheme(savedTheme, true);
+    },
+
     setupThemeListener() {
-      // Listen for system theme preference changes
-      const darkModeQuery = window.matchMedia('(prefers-color-scheme: dark)');
+      this.darkModeQuery = window.matchMedia("(prefers-color-scheme: dark)");
 
-      this.mediaQueryListener = darkModeQuery;
-
-      // Use arrow function to preserve 'this' context
-      const themeChangeHandler = (e) => {
-        // Only auto-update theme if set to 'auto'
-        const savedTheme = localStorage.getItem('theme');
-        if (savedTheme === 'auto' || !savedTheme) {
-          const newTheme = e.matches ? 'dark' : 'light';
-          console.log('System theme changed to:', newTheme);
-          this.applyThemeActual(newTheme);
+      this.themeChangeHandler = (e) => {
+        const savedTheme = localStorage.getItem("theme");
+        if (savedTheme === "auto" || !savedTheme) {
+          this.applyThemeActual(e.matches ? "dark" : "light");
         }
       };
 
-      darkModeQuery.addEventListener('change', themeChangeHandler);
-      // Store the handler so we can remove it later if needed
-      this.themeChangeHandler = themeChangeHandler;
-      this.darkModeQuery = darkModeQuery;
+      this.darkModeQuery.addEventListener("change", this.themeChangeHandler);
     },
+
     applyTheme(theme, skipSave = false) {
       this.currentTheme = theme;
+
       if (!skipSave) {
-        localStorage.setItem('theme', theme);
+        localStorage.setItem("theme", theme);
       }
 
-      // Determine actual theme to apply
       let actualTheme = theme;
-      if (theme === 'auto') {
-        const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-        actualTheme = prefersDark ? 'dark' : 'light';
+      if (theme === "auto") {
+        actualTheme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
       }
 
       this.applyThemeActual(actualTheme);
     },
-    applyThemeActual(actualTheme) {
-      // Update data-bs-theme attribute for CSS variables to work
-      document.documentElement.setAttribute('data-bs-theme', actualTheme === 'dark' ? 'dark' : 'light');
 
-      // Update HTML class for theme-based CSS selectors
-      if (actualTheme === 'dark') {
-        document.documentElement.classList.add('dark-theme');
-        document.documentElement.classList.remove('light-theme');
-      } else {
-        document.documentElement.classList.add('light-theme');
-        document.documentElement.classList.remove('dark-theme');
-      }
+    applyThemeActual(theme) {
+      document.documentElement.setAttribute("data-bs-theme", theme);
+      document.documentElement.classList.toggle("dark-theme", theme === "dark");
+      document.documentElement.classList.toggle("light-theme", theme === "light");
     },
+
     toggleTheme() {
-      // Cycle through: auto -> light -> dark -> auto
-      let newTheme;
-      if (this.currentTheme === 'auto') {
-        newTheme = 'light';
-      } else if (this.currentTheme === 'light') {
-        newTheme = 'dark';
-      } else {
-        newTheme = 'auto';
-      }
-      this.applyTheme(newTheme);
+      const cycle = { auto: "light", light: "dark", dark: "auto" };
+      this.applyTheme(cycle[this.currentTheme]);
     },
+
     detectMobile() {
-      // Detect if device is mobile/tablet based on touch capability and screen size
-      const hasTouch = () => {
-        return (
-          (typeof window !== "undefined" &&
-            ("ontouchstart" in window ||
-              navigator.maxTouchPoints > 0 ||
-              navigator.msMaxTouchPoints > 0)) ||
-          false
-        );
-      };
+      const hasTouch =
+        "ontouchstart" in window ||
+        navigator.maxTouchPoints > 0 ||
+        navigator.msMaxTouchPoints > 0;
 
-      const isMobileScreen = () => {
-        return window.innerWidth <= 1024;
-      };
-
-      this.isMobile = hasTouch() || isMobileScreen();
-      window.addEventListener("resize", this.detectMobile);
+      const isMobileScreen = window.innerWidth <= 1024;
+      this.isMobile = hasTouch || isMobileScreen;
     },
+
+    handleResize() {
+      this.detectMobile();
+    },
+
     handleKeyDown(event) {
-      const isInput = ["INPUT", "TEXTAREA"].includes(
-        document.activeElement.tagName
-      );
+      const isInput = ["INPUT", "TEXTAREA"].includes(document.activeElement.tagName);
+
       if (event.key === "/" && !isInput) {
-        event.preventDefault(); // prevent typing `/` into whatever is focused
+        event.preventDefault();
         this.$refs.filter.focus();
       }
     },
 
     createFilterRoute(params) {
       this.$refs.filter.blur();
-      history.pushState(
-        {},
-        null,
-        `${window.location.origin}#/filter=${encodeURIComponent(params)}`
-      );
+      history.pushState({}, null, `${window.location.origin}#/filter=${encodeURIComponent(params)}`);
     },
+
     fetchDeals() {
       axios
         .get("api/v1/topics")
@@ -160,68 +182,21 @@ export default {
           this.topics = response.data;
         })
         .catch((err) => {
-          console.log(err.response);
+          console.error("Failed to fetch deals:", err.response || err);
         });
     },
-  },
-  computed: {
-    formatDate() {
-      return (v) => {
-        const date = dayjs(String(v));
-        return date.format("YYYY-MM-DD hh:mm A");
-      };
-    },
-    filteredTopics() {
-      return this.topics
-        .filter((row) => {
-          const titles = (
-            row.title.toString() +
-            " [" +
-            row.Offer.dealer_name +
-            "]"
-          ).toLowerCase();
-          const filterTerm = this.filter.toLowerCase();
-          return titles.includes(filterTerm);
-        })
-        .sort((a, b) => b.score - a.score); // Always sort by score descending
-    },
-    highlightMatches() {
-      return (v) => {
-        if (this.filter == "") return v;
-        const matchExists = v.toLowerCase().includes(this.filter.toLowerCase());
-        if (!matchExists) return v;
 
-        const re = new RegExp(this.filter, "ig");
-        return v.replace(re, (matchedText) => `<mark>${matchedText}</mark>`);
-      };
-    },
-    highlightDealerName() {
-      return (dealerName) => {
-        if (this.filter == "") return dealerName;
-        const matchExists = dealerName.toLowerCase().includes(this.filter.toLowerCase());
-        if (!matchExists) return dealerName;
-
-        const re = new RegExp(this.filter, "ig");
-        return dealerName.replace(re, (matchedText) => `<mark>${matchedText}</mark>`);
-      };
-    },
-    getThemeIcon() {
-      if (this.currentTheme === 'auto') {
-        return 'brightness_auto';
-      } else if (this.currentTheme === 'dark') {
-        return 'light_mode';
-      } else {
-        return 'dark_mode';
+    initializeSortMethod() {
+      const saved = localStorage.getItem("sortMethod");
+      if (saved) {
+        this.sortMethod = saved;
       }
     },
-    getThemeTitle() {
-      if (this.currentTheme === 'auto') {
-        return 'Theme: Auto (click for Light)';
-      } else if (this.currentTheme === 'light') {
-        return 'Theme: Light (click for Dark)';
-      } else {
-        return 'Theme: Dark (click for Auto)';
-      }
+
+    toggleSort() {
+      const cycle = { score: "views", views: "recency", recency: "score" };
+      this.sortMethod = cycle[this.sortMethod];
+      localStorage.setItem("sortMethod", this.sortMethod);
     },
   },
 };
@@ -229,79 +204,80 @@ export default {
 
 <template>
   <div id="app">
-    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
     <div class="container">
       <div class="header">
         <div class="header-controls">
           <input
+            ref="filter"
             v-model="filter"
             type="text"
             placeholder="Filter deals"
-            ref="filter"
+            class="search-input"
             @keyup.enter="createFilterRoute(filter.toString())"
             @keyup.esc="$refs.filter.blur()"
-            class="search-input"
           />
-          <button @click="toggleTheme" class="theme-toggle" :title="getThemeTitle">
-            <span class="material-symbols-outlined">{{ getThemeIcon }}</span>
+          <button class="icon-button" :title="sortTitle" @click="toggleSort">
+            <span class="material-symbols-outlined">{{ sortIcon }}</span>
+          </button>
+          <button class="icon-button" :title="themeTitle" @click="toggleTheme">
+            <span class="material-symbols-outlined">{{ themeIcon }}</span>
           </button>
         </div>
       </div>
 
-        <div class="cards-grid">
-          <div
-            v-for="topic in filteredTopics"
-            :key="topic.topic_id"
-            class="deal-card"
-          >
-            <div class="card-header">
-              <div class="title-with-link">
-                <a
-                  :href="`https://forums.redflagdeals.com${topic.web_path}`"
-                  target="_blank"
-                  class="deal-title"
-                  @click.stop
-                  v-html="highlightMatches(topic.title)"
-                ></a>
-                <a
-                  v-if="topic.Offer.url"
-                  :href="topic.Offer.url"
-                  target="_blank"
-                  class="card-link"
-                  title="Open deal"
-                >
-                  <span class="material-symbols-outlined">open_in_new</span>
-                </a>
+      <div class="cards-grid">
+        <div v-for="topic in filteredTopics" :key="topic.topic_id" class="deal-card">
+          <div class="card-header">
+            <div class="title-with-link">
+              <a
+                :href="`https://forums.redflagdeals.com${topic.web_path}`"
+                target="_blank"
+                class="deal-title"
+                v-html="highlightText(topic.title)"
+              ></a>
+              <a
+                v-if="topic.Offer.url"
+                :href="topic.Offer.url"
+                target="_blank"
+                class="card-link"
+                title="Open deal"
+              >
+                <span class="material-symbols-outlined">open_in_new</span>
+              </a>
+            </div>
+            <div
+              class="score-bubble"
+              :class="{
+                positive: topic.score > 0,
+                negative: topic.score < 0,
+                neutral: topic.score === 0,
+              }"
+            >
+              <span v-if="topic.score > 0">+{{ topic.score }}</span>
+              <span v-else>{{ topic.score }}</span>
+            </div>
+          </div>
+
+          <div class="card-meta">
+            <span class="dealer-name" v-html="highlightText(topic.Offer.dealer_name)"></span>
+          </div>
+
+          <div class="card-details">
+            <div class="details-stats">
+              <div class="stat">
+                <span class="material-symbols-outlined">visibility</span>
+                <span class="stat-value">{{ topic.total_views }} views</span>
               </div>
-              <div class="score-bubble" :class="{ positive: topic.score > 0, negative: topic.score < 0, neutral: topic.score === 0 }">
-                <span v-if="topic.score > 0">+{{ topic.score }}</span>
-                <span v-else>{{ topic.score }}</span>
+              <div class="stat">
+                <span class="material-symbols-outlined">chat</span>
+                <span class="stat-value">{{ topic.total_replies }} replies</span>
               </div>
             </div>
 
-            <div class="card-meta">
-              <span class="dealer-name" v-html="highlightDealerName(topic.Offer.dealer_name)"></span>
-            </div>
-
-            <div class="card-details">
-              <div class="details-stats">
-                <div class="stat">
-                  <span class="material-symbols-outlined">visibility</span>
-                  <span class="stat-value">{{ topic.total_views }} views</span>
-                </div>
-                <div class="stat">
-                  <span class="material-symbols-outlined">chat</span>
-                  <span class="stat-value">{{ topic.total_replies }} replies</span>
-                </div>
-              </div>
-
-              <div class="card-timestamp">
-                Last post: {{ formatDate(topic.last_post_time) }}
-              </div>
-
-            </div>
+            <div class="card-timestamp">Last post: {{ formatDate(topic.last_post_time) }}</div>
           </div>
         </div>
       </div>
     </div>
+  </div>
 </template>

src/main.js

@@ -2,8 +2,6 @@ import { createApp } from "vue";
 import App from "./App.vue";
 import { createRouter, createWebHashHistory } from "vue-router";
 
-import "./theme.css";
-
 const routes = [
   {
     path: '/:pathMatch(.*)*',

src/theme.css

@@ -1,3 +1,4 @@
+/* Material Symbols Icon Font */
 .material-symbols-outlined {
   font-family: 'Material Symbols Outlined';
   font-weight: normal;
@@ -12,51 +13,95 @@
   direction: ltr;
 }
 
-/* Theme-aware CSS variables */
+/* ============================================
+   Theme Variables
+   ============================================ */
+
 :root {
   /* Light theme (default) */
   --bg-primary: #dddddd;
   --bg-secondary: #e8e8e8;
+  --bg-input: #f5f5f5;
+  --bg-input-focus: #ffffff;
   --text-primary: #212529;
   --text-secondary: #6c757d;
   --border-color: #d0d0d0;
+  --border-color-light: #cccccc;
+  --border-color-hover: #999999;
   --link-color: #212529;
+  --score-positive-bg: rgb(34, 139, 34);
+  --score-positive-text: white;
+  --score-negative-bg: rgb(247, 118, 142);
+  --score-negative-text: white;
+  --mark-bg: rgba(255, 193, 7, 0.3);
+  --shadow-light: rgba(0, 0, 0, 0.05);
+  --shadow-medium: rgba(0, 0, 0, 0.1);
 }
 
-/* Dark theme */
+/* Dark theme via media query */
 @media (prefers-color-scheme: dark) {
-  :root {
+  :root:not([data-bs-theme="light"]):not(.light-theme) {
     --bg-primary: #1a1a1a;
     --bg-secondary: #2a2a2a;
+    --bg-input: #1a1a1a;
+    --bg-input-focus: #2a2a2a;
     --text-primary: #e0e0e0;
     --text-secondary: #a0a0a0;
     --border-color: #3a3a3a;
-    --link-color: #212529;
+    --border-color-light: #555555;
+    --border-color-hover: #777777;
+    --link-color: #e0e0e0;
+    --score-positive-bg: rgb(158, 206, 106);
+    --score-positive-text: #1a1a1a;
+    --mark-bg: rgba(255, 193, 7, 0.4);
+    --shadow-light: rgba(255, 255, 255, 0.1);
   }
 }
 
-/* Support for explicit data-bs-theme attribute (Bootstrap override) */
-html[data-bs-theme="dark"] {
+/* Explicit dark theme */
+html[data-bs-theme="dark"],
+html.dark-theme {
   --bg-primary: #1a1a1a;
   --bg-secondary: #2a2a2a;
+  --bg-input: #1a1a1a;
+  --bg-input-focus: #2a2a2a;
   --text-primary: #e0e0e0;
   --text-secondary: #a0a0a0;
   --border-color: #3a3a3a;
+  --border-color-light: #555555;
+  --border-color-hover: #777777;
   --link-color: #e0e0e0;
+  --score-positive-bg: rgb(158, 206, 106);
+  --score-positive-text: #1a1a1a;
+  --mark-bg: rgba(255, 193, 7, 0.4);
+  --shadow-light: rgba(255, 255, 255, 0.1);
 }
 
+/* Explicit light theme */
 html[data-bs-theme="light"],
 html.light-theme {
   --bg-primary: #dddddd;
   --bg-secondary: #e8e8e8;
+  --bg-input: #f5f5f5;
+  --bg-input-focus: #ffffff;
   --text-primary: #212529;
   --text-secondary: #6c757d;
   --border-color: #d0d0d0;
+  --border-color-light: #cccccc;
+  --border-color-hover: #999999;
   --link-color: #212529;
+  --score-positive-bg: rgb(34, 139, 34);
+  --score-positive-text: white;
+  --mark-bg: rgba(255, 193, 7, 0.3);
+  --shadow-light: rgba(0, 0, 0, 0.05);
 }
 
+/* ============================================
+   Base Styles
+   ============================================ */
+
 html {
-  font-family: sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
   min-width: 100%;
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
@@ -73,22 +118,6 @@ body {
   padding: 0;
 }
 
-.green-score {
-  color: rgb(34, 139, 34) !important;
-}
-
-html[data-bs-theme="light"] .green-score {
-  color: rgb(34, 139, 34) !important;
-}
-
-html[data-bs-theme="dark"] .green-score {
-  color: rgb(158, 206, 106) !important;
-}
-
-.red-score {
-  color: rgb(247, 118, 142) !important;
-}
-
 a {
   color: var(--link-color);
   transition: color 0.2s ease;
@@ -98,7 +127,9 @@ a:visited {
   color: var(--link-color);
 }
 
-/* App styles */
+/* ============================================
+   Layout
+   ============================================ */
 
 .container {
   max-width: 1200px;
@@ -119,14 +150,18 @@ a:visited {
   align-items: center;
 }
 
+/* ============================================
+   Search Input
+   ============================================ */
+
 .search-input {
   flex: 1;
   max-width: 500px;
   padding: 10px 12px;
   font-size: 14px;
-  border: 1px solid #cccccc;
+  border: 1px solid var(--border-color-light);
   border-radius: 4px;
-  background-color: #f5f5f5;
+  background-color: var(--bg-input);
   color: var(--text-primary);
   transition: all 0.2s ease;
   font-family: inherit;
@@ -134,36 +169,28 @@ a:visited {
 
 .search-input:focus {
   outline: none;
-  border-color: #999999;
-  background-color: #ffffff;
-  box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.05);
-}
-
-html.dark-theme .search-input {
-  border-color: #555555;
-  background-color: #1a1a1a;
-  color: #e0e0e0;
-}
-
-html.dark-theme .search-input:focus {
-  background-color: #2a2a2a;
-  border-color: #777777;
-  box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.1);
+  border-color: var(--border-color-hover);
+  background-color: var(--bg-input-focus);
+  box-shadow: 0 0 0 2px var(--shadow-light);
 }
 
 .search-input::placeholder {
   color: var(--text-secondary);
 }
 
-.theme-toggle {
+/* ============================================
+   Icon Buttons (Theme & Sort Toggle)
+   ============================================ */
+
+.icon-button {
   display: inline-flex;
   align-items: center;
   justify-content: center;
   width: 40px;
   height: 40px;
-  border: 1px solid #cccccc;
+  border: 1px solid var(--border-color-light);
   border-radius: 4px;
-  background-color: #f5f5f5;
+  background-color: var(--bg-input);
   color: var(--text-primary);
   cursor: pointer;
   transition: all 0.2s ease;
@@ -172,25 +199,48 @@ html.dark-theme .search-input:focus {
   flex-shrink: 0;
 }
 
-.theme-toggle:hover {
-  background-color: #e8e8e8;
-  border-color: #999999;
+.icon-button:hover {
+  background-color: var(--bg-secondary);
+  border-color: var(--border-color-hover);
 }
 
+.icon-button:active {
+  transform: scale(0.95);
+}
+
+/* Legacy class names for compatibility */
+.sort-toggle,
+.theme-toggle {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 40px;
+  height: 40px;
+  border: 1px solid var(--border-color-light);
+  border-radius: 4px;
+  background-color: var(--bg-input);
+  color: var(--text-primary);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  font-size: 18px;
+  padding: 0;
+  flex-shrink: 0;
+}
+
+.sort-toggle:hover,
+.theme-toggle:hover {
+  background-color: var(--bg-secondary);
+  border-color: var(--border-color-hover);
+}
+
+.sort-toggle:active,
 .theme-toggle:active {
   transform: scale(0.95);
 }
 
-html.dark-theme .theme-toggle {
-  border-color: #555555;
-  background-color: #1a1a1a;
-  color: #e0e0e0;
-}
-
-html.dark-theme .theme-toggle:hover {
-  background-color: #2a2a2a;
-  border-color: #777777;
-}
+/* ============================================
+   Cards Grid
+   ============================================ */
 
 .cards-grid {
   display: grid;
@@ -211,11 +261,14 @@ html.dark-theme .theme-toggle:hover {
 }
 
 .deal-card:hover {
-  background-color: #15151515;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-  border-color: #999999;
+  box-shadow: 0 4px 8px var(--shadow-medium);
+  border-color: var(--border-color-hover);
 }
 
+/* ============================================
+   Card Header
+   ============================================ */
+
 .card-header {
   display: flex;
   gap: 12px;
@@ -249,26 +302,6 @@ html.dark-theme .theme-toggle:hover {
   text-decoration: underline;
 }
 
-.card-meta {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  font-size: 13px;
-  margin-bottom: 12px;
-}
-
-.dealer-name {
-  color: var(--text-secondary);
-  font-weight: 500;
-  font-size: 13px;
-}
-
-.card-timestamp {
-  color: var(--text-secondary);
-  font-size: 12px;
-  margin-top: 8px;
-}
-
 .card-link {
   display: inline-flex;
   align-items: center;
@@ -287,6 +320,10 @@ html.dark-theme .theme-toggle:hover {
   font-size: 18px;
 }
 
+/* ============================================
+   Score Bubble
+   ============================================ */
+
 .score-bubble {
   display: inline-flex;
   align-items: center;
@@ -304,26 +341,14 @@ html.dark-theme .theme-toggle:hover {
 }
 
 .score-bubble.positive {
-  background-color: rgb(34, 139, 34);
-  color: white;
+  background-color: var(--score-positive-bg);
+  color: var(--score-positive-text);
   box-shadow: 0 1px 3px rgba(34, 139, 34, 0.2);
 }
 
-html.light-theme .score-bubble.positive {
-  background-color: rgb(34, 139, 34);
-  color: white;
-  box-shadow: 0 1px 3px rgba(34, 139, 34, 0.2);
-}
-
-html.dark-theme .score-bubble.positive {
-  background-color: rgb(158, 206, 106);
-  color: #1a1a1a;
-  box-shadow: 0 1px 3px rgba(158, 206, 106, 0.2);
-}
-
 .score-bubble.negative {
-  background-color: rgb(247, 118, 142);
-  color: white;
+  background-color: var(--score-negative-bg);
+  color: var(--score-negative-text);
   box-shadow: 0 1px 3px rgba(247, 118, 142, 0.2);
 }
 
@@ -333,6 +358,24 @@ html.dark-theme .score-bubble.positive {
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.08);
 }
 
+/* ============================================
+   Card Meta & Details
+   ============================================ */
+
+.card-meta {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  font-size: 13px;
+  margin-bottom: 12px;
+}
+
+.dealer-name {
+  color: var(--text-secondary);
+  font-weight: 500;
+  font-size: 13px;
+}
+
 .card-details {
   margin-top: 12px;
   padding-top: 12px;
@@ -361,26 +404,27 @@ html.dark-theme .score-bubble.positive {
   font-weight: 500;
 }
 
-.details-section {
-  margin-bottom: 12px;
-}
-
-.details-section strong {
-  display: block;
-  color: var(--text-primary);
-  margin-bottom: 4px;
-  font-size: 13px;
-}
-
-.details-section p {
-  margin: 0;
+.card-timestamp {
   color: var(--text-secondary);
   font-size: 12px;
-  line-height: 1.4;
-  word-wrap: break-word;
+  margin-top: 8px;
 }
 
-/* Mobile responsive */
+/* ============================================
+   Mark Highlighting
+   ============================================ */
+
+mark {
+  background-color: var(--mark-bg);
+  color: inherit;
+  font-weight: 600;
+  border-radius: 2px;
+}
+
+/* ============================================
+   Mobile Responsive
+   ============================================ */
+
 @media (max-width: 768px) {
   .cards-grid {
     grid-template-columns: 1fr;
@@ -393,19 +437,4 @@ html.dark-theme .score-bubble.positive {
   .search-input {
     max-width: 100%;
   }
-}
-
-/* Mark highlighting */
-mark {
-  background-color: rgba(255, 193, 7, 0.3);
-  color: inherit;
-  font-weight: 600;
-  border-radius: 2px;
-}
-
-html.dark-theme mark {
-  background-color: rgba(255, 193, 7, 0.4);
-  color: inherit;
-  font-weight: 600;
-  border-radius: 2px;
-}
+}