From 7fd0451ddc2ea929cf6699f5525d030c74b2a5fc Mon Sep 17 00:00:00 2001 From: tobspr Date: Fri, 12 Jun 2020 19:12:35 +0200 Subject: [PATCH] Minor adjustments --- src/css/states/preload.scss | 4 +++ src/js/changelog.js | 2 +- src/js/profile/application_settings.js | 43 ++++++++++++++------------ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/css/states/preload.scss b/src/css/states/preload.scss index 9bd23358..413abd32 100644 --- a/src/css/states/preload.scss +++ b/src/css/states/preload.scss @@ -39,6 +39,10 @@ a { color: $colorBlueBright; } + li { + @include SuperSmallText; + @include S(margin-bottom, 10px); + } } } diff --git a/src/js/changelog.js b/src/js/changelog.js index 745b915d..f875ff85 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -1,7 +1,7 @@ export const CHANGELOG = [ { version: "1.1.11", - date: "unrelease", + date: "unreleased", entries: [ "Pinned shapes are now smart, they dynamically update their goal and also unpin when no longer required. Completed objectives are now rendered transparent.", "Improve upgrade number rounding, so there are no goals like '37.4k', instead it will now be '35k'", diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js index 3a426377..87c2c244 100644 --- a/src/js/profile/application_settings.js +++ b/src/js/profile/application_settings.js @@ -144,28 +144,9 @@ export const allApplicationSettings = [ */ (app, value) => app.sound.setMusicMuted(value) ), - new EnumSetting("scrollWheelSensitivity", { - options: scrollWheelSensitivities.sort((a, b) => a.scale - b.scale), - valueGetter: scale => scale.id, - textGetter: scale => T.settings.labels.scrollWheelSensitivity.sensitivity[scale.id], - category: categoryApp, - restartRequired: false, - changeCb: - /** - * @param {Application} app - */ - (app, id) => app.updateAfterUiScaleChanged(), - }), // GAME - new EnumSetting("movementSpeed", { - options: movementSpeeds.sort((a, b) => a.multiplier - b.multiplier), - valueGetter: multiplier => multiplier.id, - textGetter: multiplier => T.settings.labels.movementSpeed.speeds[multiplier.id], - category: categoryGame, - restartRequired: false, - changeCb: (app, id) => {}, - }), + new EnumSetting("theme", { options: Object.keys(THEMES), valueGetter: theme => theme, @@ -193,6 +174,28 @@ export const allApplicationSettings = [ enabled: !IS_DEMO, }), + new EnumSetting("scrollWheelSensitivity", { + options: scrollWheelSensitivities.sort((a, b) => a.scale - b.scale), + valueGetter: scale => scale.id, + textGetter: scale => T.settings.labels.scrollWheelSensitivity.sensitivity[scale.id], + category: categoryGame, + restartRequired: false, + changeCb: + /** + * @param {Application} app + */ + (app, id) => app.updateAfterUiScaleChanged(), + }), + + new EnumSetting("movementSpeed", { + options: movementSpeeds.sort((a, b) => a.multiplier - b.multiplier), + valueGetter: multiplier => multiplier.id, + textGetter: multiplier => T.settings.labels.movementSpeed.speeds[multiplier.id], + category: categoryGame, + restartRequired: false, + changeCb: (app, id) => {}, + }), + new BoolSetting("alwaysMultiplace", categoryGame, (app, value) => {}), new BoolSetting("offerHints", categoryGame, (app, value) => {}), ];