From 71515501019323fa403b04e52bc378d3463d78c1 Mon Sep 17 00:00:00 2001
From: Facinorous <63425706+Facinorous-420@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:43:11 -0400
Subject: [PATCH] Fixed the ordering of the evaluations

---
 src/components/bookmarks/item.jsx | 2 +-
 src/components/services/item.jsx  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/bookmarks/item.jsx b/src/components/bookmarks/item.jsx
index db547877..b67cffac 100644
--- a/src/components/bookmarks/item.jsx
+++ b/src/components/bookmarks/item.jsx
@@ -11,7 +11,7 @@ export default function Item({ bookmark }) {
       <a
         href={bookmark.href}
         title={bookmark.name}
-        target={settings.target ?? bookmark.target ?? "_blank"}
+        target={bookmark.target ?? settings.target ?? "_blank"}
         className="block w-full text-left cursor-pointer transition-all h-15 mb-3 rounded-md font-medium text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-theme-900/10 dark:shadow-theme-900/20 bg-theme-100/20 hover:bg-theme-300/20 dark:bg-white/5 dark:hover:bg-white/10"
       >
         <div className="flex">
diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx
index eede7508..345e2d5c 100644
--- a/src/components/services/item.jsx
+++ b/src/components/services/item.jsx
@@ -71,7 +71,7 @@ export default function Item({ service }) {
             (hasLink ? (
               <a
                 href={service.href}
-                target={settings.target ?? service.target ?? "_blank"}
+                target={service.target ?? settings.target ?? "_blank"}
                 rel="noreferrer"
                 className="flex-shrink-0 flex items-center justify-center w-12 "
               >
@@ -84,7 +84,7 @@ export default function Item({ service }) {
           {hasLink ? (
             <a
               href={service.href}
-              target={settings.target ?? service.target ?? "_blank"}
+              target={service.target ?? settings.target ?? "_blank"}
               rel="noreferrer"
               className="flex-1 flex items-center justify-between rounded-r-md "
             >