Merge branch 'develop' into delta

HabitRPG · May 9, 2024 · c554b4c · c554b4c
2 parents 462ab79 + 934b85d
commit c554b4c
Show file tree

Hide file tree

Showing 53 changed files with 1,017 additions and 1,262 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/habitica-images b/habitica-images
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "5.24.1",
+  "version": "5.24.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.10",

diff --git a/website/client/src/assets/scss/faq.scss b/website/client/src/assets/scss/faq.scss
@@ -0,0 +1,52 @@
+@import '~@/assets/scss/colors.scss';
+
+h1 {
+  margin-top: 0px;
+  line-height: 1.33;
+}
+
+li {
+  padding-bottom: 4px;
+
+  li {
+    &:first-of-type {
+      padding-top: 4px;
+    }
+    li li {
+      list-style-type: disc;
+    }
+  }
+}
+
+p {
+  margin-bottom: 21px;
+}
+
+ul {
+  padding-left: 20px;
+}
+
+.top-container {
+  width: 66.67%;
+  margin-top: 80px;
+  display: flex;
+
+  @media (max-width: 1024px) {
+    flex-wrap: wrap;
+  }
+}
+
+.main-text {
+  h3 {
+    font-size: 1.15em;
+    font-weight: 400;
+    line-height: 1.75;
+    color: $purple-200;
+  }
+
+  .body-text {
+    font-size: 1em;
+    color: $gray-10;
+    line-height: 1.71;
+  }
+}