Skip to content

Commit a4f45f1

Browse files
authored
Merge pull request #71 from JetJet13/develop
Add Real Analysis Subject | Merge to Master
2 parents abe2913 + 5c9952a commit a4f45f1

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

package-lock.json

+1-1
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,6 +1,6 @@
11
{
22
"name": "mathbook",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"private": true,
55
"scripts": {
66
"start": "node ./bin/www",

src/front-end/public/stylesheets/style.css

+9
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ body {
5959
color: white;
6060
}
6161

62+
.is-orange {
63+
background-color: #fd8e0e;
64+
color: white;
65+
}
66+
67+
.is-orange:hover {
68+
color: white;
69+
}
70+
6271
.submit {
6372
color: #23d160;
6473
}

src/front-end/tags/editor/configuration/subject.tag

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<option value="Number Theory">Number Theory</option>
1111
<option value="Geometry">Geometry</option>
1212
<option value="Combinatorics">Combinatorics</option>
13+
<option value="Real Analysis">Real Analysis</option>
1314
</select>
1415
</div>
1516
</div>

src/server/subjectMap.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{
1717
"id": "linear-algebra",
1818
"title": "Linear Algebra",
19-
"blurb": "The study of Vector Spaces and their respective Mappings.",
19+
"blurb": "The study of Vector Spaces and their respective mappings.",
2020
"example": "$$M = \\begin{bmatrix} 1 & 0 & 2 \\\\ 0 & 3 & 0 \\\\ 4 & 0 & 5 \\end{bmatrix}$$",
2121
"color": "is-info"
2222
},
@@ -34,6 +34,13 @@
3434
"example": "$$tan(x) = \\frac{sin(x)}{cos(x)}$$",
3535
"color": "is-danger"
3636
},
37+
{
38+
"id": "real-analysis",
39+
"title": "Real Analysis",
40+
"blurb": "The study of the real numbers and all things related.",
41+
"example": "$$S = \\{~x \\in \\textbf{R} ~\\vert~ x \\gt 0 ~\\}$$",
42+
"color": "is-orange"
43+
},
3744
{
3845
"id": "combinatorics",
3946
"title": "Combinatorics",

0 commit comments

Comments
 (0)