diff --git a/doc_docker.md b/doc_docker.md index 6937afc..e9dbc45 100755 --- a/doc_docker.md +++ b/doc_docker.md @@ -101,7 +101,7 @@ docker run -e MODE=standalone -e TELEMETRY=true -e ENABLE_ID_OBFUSCATION=true -e To give your instance its own colors, background and logo, put your own `theme.css` (and `logo.svg`) in `/speedtest/frontend/styling/` and `/speedtest/frontend/images/` of the container, either with a bind mount or with a `COPY` in your own image. Mount at `/speedtest/frontend`, not at `/var/www/html/frontend`: the entrypoint empties -`/var/www/html` and copies the frontend into it at every start. The modern design needs `USE_NEW_DESIGN=true`. The +`/var/www/html` and copies the frontend into it at every start. `USE_NEW_DESIGN=true` makes the modern design the default; `index-modern.html` and `?design=new` work without it. The variables and examples are in [frontend/README.md](frontend/README.md#theming). ## Multiple Points of Test diff --git a/frontend/README.md b/frontend/README.md index 6abd1cb..f92b5ea 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -39,7 +39,7 @@ html { The variables that change the look are the ones in `styling/colors.css`: the accent colors (`--theme-green`, `--theme-pink`), the texts (`--primary-text-color`, `--secondary-text-color`, `--tagline-text-color`, and the disabled ones), the background (`--background-backup-color`, `--background-overlay-color`), the start button -(`--button-*`), the server selector (`--server-selector-*`), the gauges (`--gauge-background-color`, +(`--button-*`), the server selector (`--server-selector-*`, which includes the text of the options), the gauges (`--gauge-background-color`, `--gauge-pointer-green`, `--gauge-pointer-pink`), ping and jitter (`--ping-and-jitter-*`) and the popups (`--popup-background-color`). `--gauge-progress-color` and `--popup-shadow-color` are declared but not used by the page, so changing them has no effect. @@ -73,7 +73,7 @@ COPY theme.css /speedtest/frontend/styling/theme.css COPY logo.svg /speedtest/frontend/images/logo.svg ``` -The modern design is only served when `USE_NEW_DESIGN=true`. A change to a mounted file needs a restart of the +`USE_NEW_DESIGN=true` makes the modern design the default; `index-modern.html` and `?design=new` work without it. A change to a mounted file needs a restart of the container, because the files are copied at start. ## Notes diff --git a/frontend/styling/colors.css b/frontend/styling/colors.css index 6a948d4..10b14ac 100644 --- a/frontend/styling/colors.css +++ b/frontend/styling/colors.css @@ -18,6 +18,7 @@ --button-shadow-color: #5cf9fd47; --button-disabled-background-color: #a2a2a2; + --server-selector-text-color: var(--primary-text-color); --server-selector-border-color: #625b6b; --server-selector-hover-border-color: var(--theme-green); --server-selector-background-color: #251b32; diff --git a/frontend/styling/server-selector.css b/frontend/styling/server-selector.css index e614d63..c4aca48 100644 --- a/frontend/styling/server-selector.css +++ b/frontend/styling/server-selector.css @@ -142,7 +142,7 @@ font-size: 2.4rem; font-weight: 700; letter-spacing: -0.2rem; - color: var(--sprint-text-color); + color: var(--server-selector-text-color); text-transform: uppercase; text-decoration: none; text-align: left; diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js index b95b178..19f1195 100644 --- a/tests/e2e/global-setup.js +++ b/tests/e2e/global-setup.js @@ -68,6 +68,7 @@ module.exports = async () => { const timeoutMs = 180_000; await waitForReady('standalone', 'http://127.0.0.1:18180/index.html', timeoutMs); await waitForReady('standalone-new', 'http://127.0.0.1:18185/index.html', timeoutMs); + await waitForReady('standalone-apostrophe', 'http://127.0.0.1:18186/index.html', timeoutMs); await waitForReady('standalone-alpine', 'http://127.0.0.1:18187/index.html', timeoutMs); await waitForReady('backend', 'http://127.0.0.1:18181/empty.php', timeoutMs); await waitForReady('frontend', 'http://127.0.0.1:18182/index-modern.html', timeoutMs);