Commit graph

3464 commits

Author SHA1 Message Date
Jack
344d1e3937 fixed merge issue 2021-04-08 19:12:11 +01:00
Jack
ab975b1a35
Merge pull request #1184 from Saint-dev/master
Made it so funbox gets temporarily disabled when not taking a test
2021-04-08 19:08:10 +01:00
Saint-dev
9847db8720 fixed bug with setting funbox to none 2021-04-08 13:53:29 -04:00
Jack
c7322a6d52 fixed load from preset button not working 2021-04-08 18:45:48 +01:00
Jack
baba5c656a Merge branch 'master' of https://github.com/Miodec/monkey-type 2021-04-08 18:20:30 +01:00
Jack
0f528a31c6 duplicated all files for click 4, if this doesnt fix the static issue i dont know what is causing it anymore 2021-04-08 18:20:26 +01:00
Jack
92b75f24b0
Merge pull request #1206 from UnrealApex/master
Added Maze Runner quotes
2021-04-08 18:13:31 +01:00
Jack
7a7d603fd4 added funbox watermark to the graph 2021-04-08 18:10:34 +01:00
UnrealApex
0a12e46af7 added Maze Runner quotes 2021-04-08 16:55:25 +00:00
Jack
de866e895a Merge branch 'master' of https://github.com/Miodec/monkey-type 2021-04-08 17:05:10 +01:00
Jack
0aad37f67f added some more quotes 2021-04-08 17:04:01 +01:00
Saint-dev
ecbd6000c3 fixed funbox type not showing in results screen 2021-04-08 12:02:02 -04:00
Jack
2c88fb98fd fixed typo 2021-04-08 16:51:14 +01:00
Jack
c978e9db1f
Merge pull request #1194 from SeerLite/timer-color-main
Make default timer color "main" and full opacity
2021-04-08 16:40:03 +01:00
Jack
72316efaeb fixed timer default size 2021-04-08 16:39:20 +01:00
SeerLite
0a31eda4db Improve default timer style and color
Sets timer style to mini, color to "main" and full opacity.
So it looks better by default with most themes. With some themes the
previous black+0.25 was really hard to see, or just looked really bad.
2021-04-07 16:53:35 -04:00
Jack
ea52eeff09
Remove duplicates in czech_1k.json by CrumblyLiquid
Remove duplicates in czech_1k.json
2021-04-07 16:39:46 +01:00
Jack
2d83c75e20
Merge pull request #1196 from UnrealApex/master
Monkeytype image to website on README
2021-04-07 16:38:51 +01:00
UnrealApex
b781c6822d
Monkeytype image to website
Added link to Monkeytype website in Monkeytype image.
2021-04-06 12:25:18 -07:00
UnrealApex
e242efc00f
Merge pull request #10 from Miodec/master
Merge
2021-04-06 12:21:29 -07:00
CrumblyLiquid
e8b96da852
Remove duplicates in czech_1k.json
Removes a bunch of duplicates (most of these duplicates were also incorrectly capitalized)
Fixes some capitalization issues
Removes "li" which is not a word but rather a type of suffix
2021-04-06 21:04:05 +02:00
Jack
9cfa0a8344
Merge pull request #1191 from gavinmn/apple-touch-icon
Add apple-touch-icon favicons for Safari and iOS
2021-04-06 18:18:15 +01:00
Jack
af4adc64d8
Merge pull request #1192 from CrumblyLiquid/patch-1
Update czech.json
2021-04-06 18:18:06 +01:00
CrumblyLiquid
2a1af4c935
Update czech.json
"-li" is not a word and "Český" was there twice (source: I'm native speaker)
2021-04-06 18:04:22 +02:00
Gavin Nelson
3b6e7ec388 Added apple-touch-icon favicons for Safari and iOS 2021-04-06 15:39:04 +00:00
Jack
66b228241a
Merge pull request #1185 from SeerLite/dont-quicktab-commandline
Don't quick tab restart when command line is open
2021-04-06 16:10:43 +01:00
Jack
a2763de590 Merge branch 'master' of https://github.com/Miodec/monkey-type 2021-04-06 16:10:23 +01:00
Jack
fc5753fd5d
Merge pull request #1190 from 71xn/added-gmk-muted-theme
Create muted.css
2021-04-06 16:09:56 +01:00
Jack
35bf71eae6 fixed db config restarting the test 2021-04-06 16:07:53 +01:00
Jack
a973a16a0a hopefully fixed the screenshot state freezing #1189 2021-04-06 15:34:17 +01:00
Jack
dbdbe75bd0 fixed merch banner not clickable 2021-04-06 14:06:51 +01:00
Finn Lestrange
3d38dd905a
Update _list.json 2021-04-06 12:55:10 +01:00
Finn Lestrange
be6436ba29
Update muted.css 2021-04-06 12:54:41 +01:00
Finn Lestrange
3467ba6715
Update _list.json 2021-04-06 12:10:04 +01:00
Finn Lestrange
862041b29c
Create muted.css
created a muted color scheme  / theme based on the GMK muted keycap set
2021-04-06 12:08:12 +01:00
Jack
566fc527a3
Merge pull request #1186 from Smithster/master
Custom background image filter
2021-04-06 01:36:55 +01:00
Jack
e2b1e2ade1 updated styling 2021-04-06 01:35:28 +01:00
Jack
86dc8f130f added saved notification 2021-04-06 01:25:28 +01:00
Jack
f5c65314b6 changed the way dom elements are referenced in js 2021-04-06 01:13:21 +01:00
Jack
b7f4d3c01a removed contrast
changed the way numbers are updated
2021-04-06 01:09:15 +01:00
Jack
0d802703b8 removed unnecessary events 2021-04-06 01:03:37 +01:00
Smithster
4f418788c4 fixed warnings in custom-background-filter 2021-04-06 00:59:13 +01:00
Smithster
48c7835f2b added max option to custom background image size 2021-04-06 00:58:55 +01:00
Smithster
230da777cb Added custom background filters 2021-04-06 00:29:24 +01:00
SeerLite
015f7db29d Don't quick tab restart when command line is open 2021-04-05 18:24:00 -04:00
UnrealApex
cd1d8aa305
Merge pull request #9 from Miodec/master
merge
2021-04-05 11:47:55 -07:00
Saint-dev
2df9fc379c changed how funbox was called in command-lists 2021-04-05 14:08:56 -04:00
Saint-dev
dde90f829c re-added funbox notification 2021-04-05 13:59:05 -04:00
Jack
1c08d16231
Add mountain theme by sohamb117
Add mountain theme
2021-04-05 18:40:37 +01:00
Saint-dev
a2b7aa281c refractored funbox vars 2021-04-05 13:38:19 -04:00