Merge branch 'develop'

SimonAlling · Mar 18, 2017 · 88a1add · 88a1add
2 parents 3c82a2b + 520d498
commit 88a1add
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/js/SplashScreen.js b/js/SplashScreen.js
@@ -25,14 +25,14 @@
     function showStartHint() {
         const startHintElement = byID(STRINGS.id_start_hint);
         if (isHTMLElement(startHintElement)) {
-            startHintElement.textContent = TEXT.hint_start;
+            startHintElement.innerHTML = TEXT.hint_start;
         }
     }
 
     function showFullscreenHint() {
         const fullscreenHintElement = byID(STRINGS.id_fullscreen_hint);
         if (isHTMLElement(fullscreenHintElement)) {
-            fullscreenHintElement.textContent = TEXT.getFullscreenHint(PLATFORM.getFullscreenShortcut());
+            fullscreenHintElement.innerHTML = TEXT.getFullscreenHint(PLATFORM.getFullscreenShortcut());
         }
     }
 

diff --git a/js/locales/Zatacka.en_US.js b/js/locales/Zatacka.en_US.js
@@ -8,7 +8,7 @@ const TEXT = (() => {
 
     return Object.freeze({
         hint_unload: `Are you sure you want to unload the page?`,
-        hint_start: `Press Space to start`,
+        hint_start: `Press <kbd>Space</kbd> to start`,
         hint_popup: `It is recommended to run Kurve in its own window without history (to avoid switching tabs or navigating back in history mid-game). To do that, please allow popups or <a href="ZATACKA.html" target="_blank">click here</a>.`,
         hint_pick: `Pick your desired color by pressing the corresponding LEFT key (e.g. M for Orange).`,
         hint_proceed: `Press ${KEY_PROCEED} to start!`,
@@ -20,8 +20,8 @@ const TEXT = (() => {
         hint_preferences_access_denied: `Could not save/load settings because access to localStorage was denied by the browser. This might be caused by "third-party site data" being blocked or similar.`,
         hint_preferences_localstorage_failed: `Could not save/load settings because access to localStorage failed.`,
 
-        keyboard_fullscreen_mac: `${KEY_CMD} + ${KEY_SHIFT} + F`,
-        keyboard_fullscreen_standard: "F11",
+        keyboard_fullscreen_mac: `<kbd>${KEY_CMD} + Ctrl + F</kbd> and/or <kbd>${KEY_CMD} + ${KEY_SHIFT} + F</kbd>`,
+        keyboard_fullscreen_standard: "<kbd>F11</kbd>",
 
         getFullscreenHint: (shortcut) => `Press ${shortcut} to toggle fullscreen`,
 

diff --git a/kurve.se.css b/kurve.se.css
@@ -31,6 +31,10 @@ main {
     font-size: 0.9em;
 }
 
+kbd {
+    color: white;
+}
+
 #popup-hint a {
     text-decoration: underline;
 }