monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-02-05 21:33:40 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Miodec/monkey-type

Browse source
This commit is contained in:
Miodec 2021-02-18 22:01:20 +00:00
commit 41de073e27
3 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/js/account.js
View file

@ -510,8 +510,6 @@ var resultHistoryChart = new Chart($(".pageAccount #resultHistoryChart"), {
tooltips: {
// Disable the on-canvas tooltip
enabled: true,
titleFontFamily: "Roboto Mono",
bodyFontFamily: "Roboto Mono",
intersect: false,
custom: function (tooltip) {
if (!tooltip) return;
@ -578,7 +576,6 @@ var resultHistoryChart = new Chart($(".pageAccount #resultHistoryChart"), {
legend: {
display: false,
labels: {
fontFamily: "Roboto Mono",
fontColor: "#ffffff",
},
},
@ -591,9 +588,7 @@ var resultHistoryChart = new Chart($(".pageAccount #resultHistoryChart"), {
scales: {
xAxes: [
{
ticks: {
fontFamily: "Roboto Mono",
},
ticks: {},
type: "time",
bounds: "ticks",
distribution: "series",
@ -609,7 +604,6 @@ var resultHistoryChart = new Chart($(".pageAccount #resultHistoryChart"), {
{
id: "wpm",
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
stepSize: 10,
@ -618,13 +612,11 @@ var resultHistoryChart = new Chart($(".pageAccount #resultHistoryChart"), {
scaleLabel: {
display: true,
labelString: "Words per Minute",
fontFamily: "Roboto Mono",
},
},
{
id: "acc",
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
max: 100,
},
@ -633,7 +625,6 @@ var resultHistoryChart = new Chart($(".pageAccount #resultHistoryChart"), {
scaleLabel: {
display: true,
labelString: "Error rate (100 - accuracy)",
fontFamily: "Roboto Mono",
},
gridLines: {
display: false,
@ -704,7 +695,6 @@ let activityChart = new Chart($(".pageAccount #activityChart"), {
legend: {
display: false,
labels: {
fontFamily: "Roboto Mono",
fontColor: "#ffffff",
},
},
@ -718,7 +708,6 @@ let activityChart = new Chart($(".pageAccount #activityChart"), {
xAxes: [
{
ticks: {
fontFamily: "Roboto Mono",
autoSkip: true,
autoSkipPadding: 40,
},
@ -743,7 +732,6 @@ let activityChart = new Chart($(".pageAccount #activityChart"), {
{
id: "count",
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
autoSkip: true,
@ -754,13 +742,11 @@ let activityChart = new Chart($(".pageAccount #activityChart"), {
scaleLabel: {
display: true,
labelString: "Time Typing",
fontFamily: "Roboto Mono",
},
},
{
id: "avgWpm",
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
autoSkip: true,
@ -772,7 +758,6 @@ let activityChart = new Chart($(".pageAccount #activityChart"), {
scaleLabel: {
display: true,
labelString: "Average Wpm",
fontFamily: "Roboto Mono",
},
gridLines: {
display: false,
@ -832,16 +817,12 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
},
options: {
tooltips: {
titleFontFamily: "Roboto Mono",
bodyFontFamily: "Roboto Mono",
mode: "index",
intersect: false,
},
legend: {
display: false,
labels: {
defaultFontFamily: "Roboto Mono",
},
labels: {},
},
responsive: true,
maintainAspectRatio: false,
@ -849,7 +830,6 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
xAxes: [
{
ticks: {
fontFamily: "Roboto Mono",
autoSkip: true,
autoSkipPadding: 40,
},
@ -857,7 +837,6 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
scaleLabel: {
display: false,
labelString: "Seconds",
fontFamily: "Roboto Mono",
},
},
],
@ -868,10 +847,8 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
scaleLabel: {
display: true,
labelString: "Words per Minute",
fontFamily: "Roboto Mono",
},
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
autoSkip: true,
@ -887,10 +864,8 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
scaleLabel: {
display: true,
labelString: "Raw Words per Minute",
fontFamily: "Roboto Mono",
},
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
autoSkip: true,
@ -907,11 +882,9 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
scaleLabel: {
display: true,
labelString: "Errors",
fontFamily: "Roboto Mono",
},
ticks: {
precision: 0,
fontFamily: "Roboto Mono",
beginAtZero: true,
autoSkip: true,
autoSkipPadding: 40,
@ -936,7 +909,6 @@ let hoverChart = new Chart($(".pageAccount #hoverChart"), {
label: {
// Background color of label, default below
backgroundColor: "blue",
fontFamily: "Roboto Mono",
// Font size of text, inherits from global
fontSize: 11,

17
src/js/script.js
View file

@ -2356,7 +2356,7 @@ function showResult(difficultyFailed = false) {
borderDash: [2, 2],
label: {
backgroundColor: themeColors.sub,
fontFamily: "Roboto Mono",
fontFamily: config.fontFamily.replace(/_/g, " "),
fontSize: 11,
fontStyle: "normal",
fontColor: themeColors.bg,
@ -2436,7 +2436,6 @@ function showResult(difficultyFailed = false) {
borderDash: [2, 2],
label: {
backgroundColor: themeColors.sub,
fontFamily: "Roboto Mono",
fontSize: 11,
fontStyle: "normal",
fontColor: themeColors.bg,
@ -6135,8 +6134,6 @@ let wpmOverTimeChart = new Chart(ctx, {
},
options: {
tooltips: {
titleFontFamily: "Roboto Mono",
bodyFontFamily: "Roboto Mono",
mode: "index",
intersect: false,
callbacks: {
@ -6160,9 +6157,7 @@ let wpmOverTimeChart = new Chart(ctx, {
},
legend: {
display: false,
labels: {
defaultFontFamily: "Roboto Mono",
},
labels: {},
},
responsive: true,
maintainAspectRatio: false,
@ -6170,7 +6165,6 @@ let wpmOverTimeChart = new Chart(ctx, {
xAxes: [
{
ticks: {
fontFamily: "Roboto Mono",
autoSkip: true,
autoSkipPadding: 40,
},
@ -6178,7 +6172,6 @@ let wpmOverTimeChart = new Chart(ctx, {
scaleLabel: {
display: false,
labelString: "Seconds",
fontFamily: "Roboto Mono",
},
},
],
@ -6189,10 +6182,8 @@ let wpmOverTimeChart = new Chart(ctx, {
scaleLabel: {
display: true,
labelString: "Words per Minute",
fontFamily: "Roboto Mono",
},
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
autoSkip: true,
@ -6208,10 +6199,8 @@ let wpmOverTimeChart = new Chart(ctx, {
scaleLabel: {
display: true,
labelString: "Raw Words per Minute",
fontFamily: "Roboto Mono",
},
ticks: {
fontFamily: "Roboto Mono",
beginAtZero: true,
min: 0,
autoSkip: true,
@ -6228,11 +6217,9 @@ let wpmOverTimeChart = new Chart(ctx, {
scaleLabel: {
display: true,
labelString: "Errors",
fontFamily: "Roboto Mono",
},
ticks: {
precision: 0,
fontFamily: "Roboto Mono",
beginAtZero: true,
autoSkip: true,
autoSkipPadding: 40,

1
src/js/userconfig.js
View file

@ -980,6 +980,7 @@ function setFontFamily(font, nosave) {
}
config.fontFamily = font;
document.documentElement.style.setProperty("--font", font.replace(/_/g, " "));
Chart.defaults.global.defaultFontFamily = font.replace(/_/g, " ");
if (!nosave) saveConfigToCookie();
}