From 918df865da8d1b574cd6be218770578582d2b410 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 11:51:05 +0100 Subject: [PATCH 1/9] added discord link --- public/css/style.scss | 14 ++++++++++++++ public/index.html | 5 +++++ public/themes/dots.css | 38 +++++++++++++++++++++----------------- public/themes/dracula.css | 12 ++++++++---- public/themes/oblivion.css | 12 ++++++++---- 5 files changed, 56 insertions(+), 25 deletions(-) diff --git a/public/css/style.scss b/public/css/style.scss index df4569306..53f9085dc 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -351,6 +351,20 @@ a:hover { transition: 0.25s; padding: 0.5rem; border-radius: var(--roundness); + &.discord{ + position: relative; + &::after{ + width: .5rem; + height: .5rem; + content: ""; + position: absolute; + background: #da3333; + border-radius: 1rem; + top: .25rem; + right: .25rem; + border: 2px solid var(--bg-color); + } + } &:focus{ background: var(--sub-color); color: var(--main-color); diff --git a/public/index.html b/public/index.html index e8e3a5406..125fa3763 100644 --- a/public/index.html +++ b/public/index.html @@ -82,6 +82,11 @@ + +
+ +
+
diff --git a/public/themes/dots.css b/public/themes/dots.css index e52f19472..96b6ab88f 100644 --- a/public/themes/dots.css +++ b/public/themes/dots.css @@ -21,17 +21,33 @@ color: #121520; } -#menu .button:nth-child(1){ - background: #9261ff; -} - -#menu:before{ +/* #menu:before{ content: ""; background: #f94348; width: 1.25rem; height: 1.25rem; padding: .5rem; border-radius: 10rem; +} */ + +#menu .button:nth-child(1){ + background: #f94348; +} + +#menu .button:nth-child(2){ + background: #9261ff; +} + +#menu .button:nth-child(3){ + background: #3cc5f8; +} + +#menu .button:nth-child(4){ + background: #4acb8a; +} + +#menu .button:nth-child(5), #menu .button:nth-child(6){ + background: #ffd543; } #menu:after{ @@ -41,16 +57,4 @@ height: 1.25rem; padding: .5rem; border-radius: 10rem; -} - -#menu .button:nth-child(2){ - background: #3cc5f8; -} - -#menu .button:nth-child(3){ - background: #4acb8a; -} - -#menu .button:nth-child(4), #menu .button:nth-child(5){ - background: #ffd543; } \ No newline at end of file diff --git a/public/themes/dracula.css b/public/themes/dracula.css index 6b19e3550..ee8945f63 100644 --- a/public/themes/dracula.css +++ b/public/themes/dracula.css @@ -18,21 +18,25 @@ } #menu .button:nth-child(1){ - color: #8be9fd; + color: #ec75c4; } #menu .button:nth-child(2){ - color: #50fa7b; + color: #8be9fd; } #menu .button:nth-child(3){ - color: #f1fa8c; + color: #50fa7b; } #menu .button:nth-child(4){ - color: #ffb86c; + color: #f1fa8c; } #menu .button:nth-child(5){ color: #ffb86c; +} + +#menu .button:nth-child(6){ + color: #ffb86c; } \ No newline at end of file diff --git a/public/themes/oblivion.css b/public/themes/oblivion.css index 1a0e13d8e..838f0edc7 100644 --- a/public/themes/oblivion.css +++ b/public/themes/oblivion.css @@ -6,18 +6,22 @@ } #menu .button:nth-child(1){ - color: #8db14b; + color: #9a90b4; } #menu .button:nth-child(2){ - color: #fca321; + color: #8db14b; } #menu .button:nth-child(3){ + color: #fca321; +} + +#menu .button:nth-child(4){ color: #2984a5; } -#menu .button:nth-child(4), -#menu .button:nth-child(5){ +#menu .button:nth-child(5), +#menu .button:nth-child(6){ color: #dd452e; } \ No newline at end of file From 95279adbc0384d5b446d58b3dd3381dd74e7ea59 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 11:59:55 +0100 Subject: [PATCH 2/9] missing semicolor --- public/js/account.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/account.js b/public/js/account.js index ce9c9ed33..c5d8b04e8 100644 --- a/public/js/account.js +++ b/public/js/account.js @@ -122,7 +122,7 @@ firebase.auth().onAuthStateChanged(function(user) { var providerData = user.providerData; showNotification('Signed in', 2000); $(".pageLogin .preloader").addClass('hidden'); - updateAccountLoginButton() + updateAccountLoginButton(); } }); From d04133446ad836e9cc501127722015c25b507723 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 12:00:23 +0100 Subject: [PATCH 3/9] fixed menu button not changing back to login when logging out. fixes #50 --- public/js/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/script.js b/public/js/script.js index 6494d3509..466e65520 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -791,7 +791,7 @@ function updateAccountLoginButton() { // $("#menu .button.account").removeClass('hidden'); // $("#menu .button.login").addClass('hidden'); } else { - swapElements($("#menu .button.login"), $("#menu .button.account"), 250); + swapElements($("#menu .button.account"), $("#menu .button.login"), 250); // $("#menu .button.login").removeClass('hidden'); // $("#menu .button.account").addClass('hidden'); } From 2cf4f4f3a64e3b07ca01db9e3e539bf8df2d87a5 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 12:09:37 +0100 Subject: [PATCH 4/9] red discord icon badge is now hidden when focus is triggered --- public/css/style.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/css/style.scss b/public/css/style.scss index 53f9085dc..2fbef8004 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -353,7 +353,8 @@ a:hover { border-radius: var(--roundness); &.discord{ position: relative; - &::after{ + &::after{ + transition: .25s; width: .5rem; height: .5rem; content: ""; @@ -374,6 +375,9 @@ a:hover { } } +#top.focus #menu .button.discord::after{ + background: transparent; +} #menu .button .icon { display: grid; From de9f274b977d06185ff3893c7e5869bc85f530d3 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 12:16:23 +0100 Subject: [PATCH 5/9] updated serika colors to be more readable --- public/themes/serika.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/themes/serika.css b/public/themes/serika.css index 3b2a97155..e074914d1 100644 --- a/public/themes/serika.css +++ b/public/themes/serika.css @@ -1,6 +1,6 @@ :root { - --bg-color: #e2b714; - --main-color: #323437; - --caret-color: #323437; - --sub-color: #d1d0c5; + --main-color: #e2b714; + --caret-color: #e2b714; + --sub-color: #323437; + --bg-color: #e1e1e3; } \ No newline at end of file From dcbda83c0ae6600cdf79c110662a2c8468d00c6f Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 12:17:36 +0100 Subject: [PATCH 6/9] fixed dots theme leaving the outline of the discord badge --- public/themes/dots.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/themes/dots.css b/public/themes/dots.css index 96b6ab88f..3d32cd66c 100644 --- a/public/themes/dots.css +++ b/public/themes/dots.css @@ -57,4 +57,8 @@ height: 1.25rem; padding: .5rem; border-radius: 10rem; -} \ No newline at end of file +} + +#top.focus #menu .button.discord::after{ + border-color: transparent; + } \ No newline at end of file From 653085704e11696ef5082ea5a7f8e6d1c523d85d Mon Sep 17 00:00:00 2001 From: Jack Bartnik Date: Fri, 22 May 2020 12:32:18 +0100 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66a06cda0..0fba1d183 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,6 @@ If you wish to support further development and feeling extra awesome, you can do 1. Head to [the firebase console](https://console.firebase.google.com/u/0/) and make a new project (the project name doesnt really matter, but just name it `monkey-type`). You dont need to enable analytics for it. 2. Install the [Firebase Command Line Interface](https://firebase.google.com/docs/cli), and use `firebase login` to log in to the same google account as you just used to make the project 3. Make sure the project name inside `.firebaserc` is the same as what you made it in step 1 -4. Git clone the project and then run `firebase serve --only functions` to start a local server on post 5000. Use ctrl+c to stop it. +4. Git clone the project and then run `firebase serve --only hosting` to start a local server on post 5000. Use ctrl+c to stop it. That should be it. If you run into any problems, let me know. From f5f02836cd95f53e87eaa5d9b2c29789ea7e520b Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 12:53:55 +0100 Subject: [PATCH 8/9] added a link to discord on the about page --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 125fa3763..d53afd6ec 100644 --- a/public/index.html +++ b/public/index.html @@ -205,7 +205,7 @@

bug report or feature request

-

If you encounter a bug, or have a feature request - send me a message on Reddit, create an issue on GitHub or send me a message using the command line esc.

+

If you encounter a bug, or have a feature request - join the Discord server, send me a message on Reddit, create an issue on GitHub or send me a message using the command line esc.

credits

From c812481ccd4ceb1294d71d36bce9aa57c435c564 Mon Sep 17 00:00:00 2001 From: Jack Date: Fri, 22 May 2020 12:54:02 +0100 Subject: [PATCH 9/9] added a command to join the discord --- public/js/commandline.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/js/commandline.js b/public/js/commandline.js index c68ea9961..31d0e7be5 100644 --- a/public/js/commandline.js +++ b/public/js/commandline.js @@ -96,6 +96,13 @@ let commands = { showCommandLine(); } }, + { + id: "joinDiscord", + display: "Join the Discord server", + exec: () => { + window.open("https://discord.gg/xMYrWg6") + } + }, { id: "sendDevMessage", display: "Send a message ( bug report / feature request / feedback )...",