From 0b8ea779f31fc8c11d6ba2e4e88242f3e61addbf Mon Sep 17 00:00:00 2001
From: Tai Groot <tai@taigrr.com>
Date: Wed, 28 Oct 2020 21:53:55 -0700
Subject: [PATCH] chore: fix merge conflict on Generic

---
 docs/configuration.md               | 1 +
 src/components/services/Generic.vue | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/configuration.md b/docs/configuration.md
index d57ec83..b2be9eb 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -119,6 +119,7 @@ services:
         type: "PiHole" # optional, loads a specific component that provides extra features. MUST MATCH a file name (without file extension) available in `src/components/services`
         target: "_blank" # optional html a tag target attribute
         # class: "green" # optional custom CSS class for card, useful with custom stylesheet
+        # background: red # optional color for card to set color directly without custom stylesheet
 ```
 
 If you choose to fetch message information from an endpoint, the output format should be:
diff --git a/src/components/services/Generic.vue b/src/components/services/Generic.vue
index 70dc561..099889a 100644
--- a/src/components/services/Generic.vue
+++ b/src/components/services/Generic.vue
@@ -12,7 +12,11 @@ export default {};
 
 <template>
   <div>
-    <div class="card" :class="item.class">
+    <div
+      class="card"
+      :style="`background-color:${item.background};`"
+      :class="item.class"
+    >
       <a
         :href="item.url"
         class="linkoverlay"