Commit Graph

101 Commits

Author SHA1 Message Date
Elliptic Ellipsis 4aaec75831 Merge remote-tracking branch 'upstream/master' into mm_faq 2021-12-18 22:18:39 +00:00
Rory Kelly 061ba43985 Merge pull request #62 from EllipticEllipsis/add_tmc
Add TMC, enable chart to only display one line
2021-12-19 17:07:47 +00:00
Elliptic Ellipsis 0a78fbaf49 Amend MM FAQ 2021-12-18 22:18:16 +00:00
EllipticEllipsis 34f8e268cd Merge pull request #61 from hensldm/md-link-fix
Fix markdown link rendering
2021-12-18 20:02:33 +00:00
Derek Hensley 6af17b0765 Fix markdown link rendering 2021-12-18 09:41:33 -08:00
EllipticEllipsis 95ae4e962e Merge pull request #60 from rozzan/favicon
Update favicon.
2021-12-18 16:24:51 +00:00
Rory Kelly ae865f451a Merge pull request #59 from EllipticEllipsis/mm-json-fix
Fix MM json subdivisions ordering
2021-12-18 16:23:35 +00:00
Rory Kelly 8e8d40d2ef Update favicon. 2021-12-18 16:22:58 +00:00
Ethan Roseman c3556d2e84 Merge pull request #55 from zeldaret/ci
CI and minor changes
2021-12-18 09:16:08 -05:00
Ethan Roseman a73714222c Update src/assets/md/oot_faq.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-18 09:15:36 -05:00
Ethan Roseman 346688eb01 Update src/assets/md/mm_faq.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-18 09:15:33 -05:00
Ethan Roseman 189bcfb5ff only do it on updates to master 2021-12-18 22:32:24 +09:00
Ethan Roseman f33cc2ffe4 last stuffs 2021-12-18 22:19:59 +09:00
Elliptic Ellipsis 7dbc9c0aef Amend first question 2021-12-18 13:19:20 +00:00
Elliptic Ellipsis 97c673f5c8 Add TMC, enable chart to only display one line 2021-12-18 13:10:48 +00:00
EllipticEllipsis fda7e4639a Merge pull request #54 from zeldaret/discord-links
Use correct discord link in header.
2021-12-18 12:56:45 +00:00
Rory Kelly 9822982b30 Use correct discord link in header. 2021-12-18 12:53:47 +00:00
Ethan Roseman 41dcc4bc7d rebrand 2021-12-18 21:53:16 +09:00
Ethan Roseman 3dd9ebf37b scp thrice for good measure 2021-12-18 21:31:59 +09:00
Rory Kelly 91022f7837 Merge pull request #53 from zeldaret/asset-unscrape
Asset unscrape
2021-12-18 12:28:44 +00:00
Ethan Roseman 66ca9e4df6 scp part 2 2021-12-18 21:26:58 +09:00
Rory Kelly b4fc61a2ed Readd appropriate JSON files. 2021-12-18 12:20:57 +00:00
Rory Kelly 06677ed2cc Update gitignore. 2021-12-18 12:18:55 +00:00
Ethan Roseman 493e489f7e scp (5) 2021-12-18 21:17:31 +09:00
Ethan Roseman 08fc1945bd budgeting probs (4) 2021-12-18 21:03:16 +09:00
Ethan Roseman 1f1606da5e 3 2021-12-18 20:28:35 +09:00
Ethan Roseman 3ebdfc86dc 2 2021-12-18 20:25:27 +09:00
Ethan Roseman 2d6c15fda6 CI test (1) 2021-12-18 20:23:32 +09:00
Elliptic Ellipsis 3d67278467 Fix MM json subdivisions ordering 2021-12-18 05:41:51 +00:00
EllipticEllipsis acc8257e6d Merge pull request #48 from zeldaret/disable-logos
Remove avatars from game-summary.
2021-12-18 02:10:34 +00:00
EllipticEllipsis 704c4e245f Merge pull request #47 from zeldaret/asset-scrape
Remove dynamic assets from the repository.
2021-12-18 02:06:58 +00:00
Rory Kelly cb672070ce Remove avatars from game-summary. 2021-12-18 02:01:10 +00:00
Rory Kelly ea1baa1940 Merge pull request #46 from EllipticEllipsis/Progress
Various fixes and some colour work
2021-12-18 01:55:51 +00:00
Rory Kelly 174877be8c Remove dynamic assets from the repository. 2021-12-17 19:22:24 +00:00
Rory Kelly b33e32cbff Merge pull request #44 from EllipticEllipsis/Progress
Progress boxes overhaul
2021-12-17 19:00:48 +00:00
EllipticEllipsis 783b898dae Merge pull request #45 from zeldaret/statement-dialog
Change heading styles for dialog.
2021-12-17 18:41:40 +00:00
Rory Kelly 63c84e16b3 Change heading styles for dialog. 2021-12-17 18:26:38 +00:00
EllipticEllipsis 1116a6da14 Merge branch 'angular' into Progress 2021-12-17 18:15:42 +00:00
EllipticEllipsis d39921f7a6 Merge pull request #42 from zeldaret/statement-dialog
Statement dialog
2021-12-17 18:14:08 +00:00
Rory Kelly ee27bb59a7 Merge branch 'statement-dialog' of github.com:zeldaret/website into statement-dialog 2021-12-17 18:09:18 +00:00
Rory Kelly ad68630b21 Add dash to statement.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-17 18:08:58 +00:00
Rory Kelly aded70cb88 Add optional subtitle field to statement. 2021-12-17 18:06:35 +00:00
Elliptic Ellipsis 413b170d5e Shadow and games menu colours 2021-12-16 05:20:06 +00:00
Elliptic Ellipsis 6ed8832961 Review 2021-12-16 04:23:13 +00:00
Elliptic Ellipsis 128143e176 Tooltip fix 2021-12-16 03:35:45 +00:00
Elliptic Ellipsis 9b0738fa4f Header stickiness 2021-12-16 03:35:36 +00:00
Elliptic Ellipsis b0c3d6c1bc Fix the dialog bg, ul, li 2021-12-16 02:38:58 +00:00
Elliptic Ellipsis a566039a41 Fix statement button colour 2021-12-16 02:31:35 +00:00
Elliptic Ellipsis 71cdb1d6bf Merge branch 'Progress' of github.com:EllipticEllipsis/zeldaret-website into Progress 2021-12-16 02:23:41 +00:00
Elliptic Ellipsis 632a22a093 Progress chart and material colours 2021-12-16 02:21:50 +00:00