Skip to content

Commit 57b0233

Browse files
Merge remote-tracking branch 'origin/develop' into develop
2 parents 0396c74 + 934b85d commit 57b0233

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1017
-1262
lines changed

.github/dependabot.yml

-150
This file was deleted.

habitica-images

Submodule habitica-images updated 1678 files

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "habitica",
33
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
4-
"version": "5.24.1",
4+
"version": "5.24.2",
55
"main": "./website/server/index.js",
66
"dependencies": {
77
"@babel/core": "^7.22.10",
+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
@import '~@/assets/scss/colors.scss';
2+
3+
h1 {
4+
margin-top: 0px;
5+
line-height: 1.33;
6+
}
7+
8+
li {
9+
padding-bottom: 4px;
10+
11+
li {
12+
&:first-of-type {
13+
padding-top: 4px;
14+
}
15+
li li {
16+
list-style-type: disc;
17+
}
18+
}
19+
}
20+
21+
p {
22+
margin-bottom: 21px;
23+
}
24+
25+
ul {
26+
padding-left: 20px;
27+
}
28+
29+
.top-container {
30+
width: 66.67%;
31+
margin-top: 80px;
32+
display: flex;
33+
34+
@media (max-width: 1024px) {
35+
flex-wrap: wrap;
36+
}
37+
}
38+
39+
.main-text {
40+
h3 {
41+
font-size: 1.15em;
42+
font-weight: 400;
43+
line-height: 1.75;
44+
color: $purple-200;
45+
}
46+
47+
.body-text {
48+
font-size: 1em;
49+
color: $gray-10;
50+
line-height: 1.71;
51+
}
52+
}

0 commit comments

Comments
 (0)