From 81f7fbc2d5bab0b9a12fd2ee4d6d7ce1a1de5558 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 20 Jun 2023 18:07:21 -0400
Subject: [PATCH] WIP(faq): rawr why css no work?

---
 .../src/components/static/chatSunsetFaq.vue   | 77 +++++++++----------
 website/common/locales/en/faq.json            |  8 +-
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/website/client/src/components/static/chatSunsetFaq.vue b/website/client/src/components/static/chatSunsetFaq.vue
index 1cd41f5d63..6545eb5cd1 100644
--- a/website/client/src/components/static/chatSunsetFaq.vue
+++ b/website/client/src/components/static/chatSunsetFaq.vue
@@ -287,36 +287,36 @@
                 </li>
               </ul>
             </div>
+          </div>
 
-            <!-- Daniel in sweet, sweet retirement with Jorts -->
-            <div class="row daniel-width">
-              <div class="gradient">
-              </div>
-              <div
-                class="grassy-meadow-backdrop"
-                :style="{'background-image': imageURLs.background}"
-              >
-                <div
-                  class="daniel_front"
-                  :style="{'background-image': imageURLs.npc}"
-                ></div>
-                <div
-                  class="pixel-border"
-                  :style="{'background-image': imageURLs.pixel_border}"
-                ></div>
-              </div>
+          <!-- Daniel in sweet, sweet retirement with Jorts -->
+          <div class="row daniel-width">
+            <div class="gradient">
             </div>
-
-            <!-- email admin -->
-            <div class="row d-flex mx-auto">
-              <div class="question d-flex mx-auto">
-                {{ $t('anotherQuestion') }}
-              </div>
+            <div
+              class="grassy-meadow-backdrop"
+              :style="{'background-image': imageURLs.background}"
+            >
               <div
-                class="contact d-flex mx-auto"
-              >
-                <p v-html="$t('contactAdmin')"></p> <!-- there's html in here -->
-              </div>
+                class="daniel_front"
+                :style="{'background-image': imageURLs.npc}"
+              ></div>
+              <div
+                class="pixel-border"
+                :style="{'background-image': imageURLs.pixel_border}"
+              ></div>
+            </div>
+          </div>
+
+          <!-- email admin -->
+          <div class="row d-flex">
+            <div class="question mx-auto">
+              <p>{{ $t('anotherQuestion') }}</p>
+            </div>
+            <div
+              class="contact mx-auto"
+            >
+              <p v-html="$t('contactAdmin')"></p> <!-- there's html in here -->
             </div>
           </div>
         </div>
@@ -364,28 +364,18 @@
     line-height: 1.71;
   }
 
-  p {
-    margin-bottom: 1.5em;
-  }
-
-  ul {
-    padding-left: 20px;
-  }
-
-  li::marker {
-    size: 0.5em;
-  }
-
   .sidebar {
     background-color: $gray-700;
     padding: 24px 0;
     margin: 0 0 22px 24px;
     border-radius: 16px;
+    width: 330px;
+    max-height: fit-content;;
   }
+
 .svg-icon {
     width: 10px;
     display: inline-block;
-    margin-left: .5em;
   }
 
   .tier1-icon, .tier2-icon {
@@ -444,7 +434,7 @@
     .tier-list {
     list-style-type: none;
     padding: 0;
-    width: 282px;
+    width: 100%;
     font-size: 1em !important;
 
     li {
@@ -503,6 +493,7 @@
   .daniel-width {
     max-width: 100%;
     margin-top: 24px;
+    margin-left: -24px;
   }
 
   .gradient {
@@ -534,18 +525,20 @@
     margin-top: -30px;
   }
 
-  .question {
+  .question p {
     font-size: 1em;
     font-weight: bold;
     line-height: 1.71;
     color: $gray-10;
     margin-top: 24px;
+    margin-bottom: 0px;
   }
 
   .contact p {
     font-size: 1em;
     margin-bottom: 0px;
   }
+
 </style>
 
 <script>
diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json
index bb939ba455..339f170121 100644
--- a/website/common/locales/en/faq.json
+++ b/website/common/locales/en/faq.json
@@ -135,14 +135,14 @@
 
   "sunsetFaqTitle": "Habitica Tavern and Guild Service Discontinuation FAQ",
 
-  "sunsetFaqPara1": "Due to a number of factors, including changes in how our player base interacts with Habitica and new content regulations, we are making the difficult decision to discontinue Tavern and Guild services on <strong>August 8, 2023 (Eastern Daylight Time)</strong>.",
+  "sunsetFaqPara1": "Due to a number of factors, including changes in how our player base interacts with Habitica and new content regulations, we are making the difficult decision to discontinue Tavern and Guild services on <strong>August 8, 2023</strong>.",
   "sunsetFaqPara2": "Habitica’s primary purpose is and has always been to provide a gamified task management experience. Tavern and Guilds helped motivate players by helping them find others with similar goals. Some truly wonderful spaces were created and we had a chance to see the community thrive with helpful discussion. As the years passed, we noticed changes in how players use and rely on Habitica. Parties flourished, while Guilds and public spaces were used by less and less of our player base. In an ever changing internet landscape, the resources necessary to maintain these spaces became too disproportionate to the number of people actually participating in them.",
   "sunsetFaqPara3": "We’re making this decision so we can better focus our resources on the parts of Habitica players rely on most without disrupting anyone’s access.",
   "sunsetFaqPara4": "To celebrate the times we’ve had, we will be gifting everyone a Veteran Pet as we move forward into this new era. For our amazing contributors, we’ll also be sending out a special gear set to commemorate all their hard work in Habitica’s communities.",
   "sunsetFaqPara5": "If you’d like to know more about what's changing, you can read the details below.",
 
   "sunsetFaqHeader1": "Which services are ending?",
-  "sunsetFaqPara6": "Service for Tavern as well as public and private Guilds is ending and these spaces will be removed from Habitica on <strong>August 8, 2023 (Eastern Daylight Time)</strong>.",
+  "sunsetFaqPara6": "Service for Tavern as well as public and private Guilds is ending and these spaces will be removed from Habitica on <strong>August 8, 2023</strong>.",
 
   "sunsetFaqHeader2": "Why are the Tavern and Guild services ending?",
   "sunsetFaqList1": "Habitica’s primary purpose is to provide motivation through a gamified task management experience. Guilds and Tavern are utilized by a disproportionately small percentage of our player base. The majority of players use outside services that are primarily intended for social interaction and are intentionally designed and maintained with those use cases in mind.",
@@ -165,9 +165,9 @@
   "sunsetFaqPara11": "Our new Looking for Party feature is now available. Most players who look for a Party receive an invite within minutes! The team is working hard to add more platform support and improvements to this feature in the near future. You can learn more about how to search for Parties and Party members from our FAQ.",
 
   "sunsetFaqHeader8": "How does this affect Habitica contributors?",
-  "sunsetFaqPara12": "As an open-source project, we welcome and encourage many types of contributions. To show our appreciation we will be sending the Heroic gear set to everyone that has a contributor tier as of <strong>August 8, 2023 (Eastern Daylight Time)</strong>. When Tavern and Guild services end, there will be some changes to contributions as well. You can read more about the plan for each type below.",
+  "sunsetFaqPara12": "As an open-source project, we welcome and encourage many types of contributions. To show our appreciation we will be sending the Heroic gear set to everyone that has a contributor tier as of <strong>August 8, 2023</strong>. When Tavern and Guild services end, there will be some changes to contributions as well. You can read more about the plan for each type below.",
   "sunsetFaqPara13": "<strong>Blacksmiths</strong><br />We still welcome open-source help through our GitHub and will continue awarding tiers for qualifying contributions. Blacksmith collaboration and discussion has largely taken place over GitHub and that will continue.",
-  "sunsetFaqPara14": "<strong>Linguists</strong><br />We continue to welcome help with translating the apps and website and will still be awarding contributor tiers for qualifying contributions. Learn more about our updated procedures for translation here.",
+  "sunsetFaqPara14": "<strong>Linguists</strong><br />We continue to welcome help with translating the apps and website and will still be awarding contributor tiers for qualifying contributions. Learn more about <a href='https://translate.habitica.com'>our updated procedures for translation here</a>.",
   "sunsetFaqPara15": "<strong>Challengers</strong><br />The team encourages you to continue creating high quality Challenges. We would like to explore new ways of promoting Challenge discoverability in and outside of the app.",
   "sunsetFaqPara16": "<strong>Socialites</strong><br />This type of contribution will be ending with the Tavern and Guild discontinuation. We are extremely grateful for the work that our friendly and helpful players have done answering questions in our chat spaces.",
   "sunsetFaqPara17": "<strong>Comrades</strong><br />Scripts and add-ons are helpful to a shrinking section of our user base as the mobile apps increasingly become the only way that most users access Habitica. Contributors wishing to create 3rd party tools to customize their Habitica experience can continue doing so, but we will no longer be awarding Comrade tiers as we focus on contributions that enhance Habitica in a way that is accessible to our player base as a whole.",