From 7076ebb0b77feb17c0d02c2263f5d6b24e561eb4 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Fri, 4 Oct 2024 07:09:12 +0000 Subject: [PATCH 01/26] corrected README.md #125 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b6c4048de..8376a19e0 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ npm run serve ## Deployment You can deploy docs-next in a various infrastructure (as every React/TS application). You can just spin a docker container, or deploy it directly on -an ECS Server or on a CCE Kubernetes Cluster (recommended). Check the architecture and provided Helm Charts for the latter at [Open Telekom Cloud Architecture Center Helm Charts](https://github.com/akyriako/docs-next-charts) repository. +an ECS Server or on a CCE Kubernetes Cluster (recommended). Check the architecture and provided Helm Charts for the latter at [Open Telekom Cloud Architecture Center Helm Charts](https://github.com/opentelekomcloud-infra/docs-next-charts) repository. ### Manual @@ -136,7 +136,7 @@ The repository is already employed with a GitHub Release Workflow that will do t 1. Builds the application for production (`npm run build`) 2. Builds and tags a container image and push the image to a predefined docker hub organization -3. Updates the Helm Charts with new versions and image tags in [Open Telekom Cloud Architecture Center Helm Charts](https://github.com/akyriako/docs-next-charts) +3. Updates the Helm Charts with new versions and image tags in [Open Telekom Cloud Architecture Center Helm Charts](https://github.com/opentelekomcloud-infra/docs-next-charts) ArgoCD (deployed on the same CCE Cluster) will pick up the changes, within its `timeout.reconciliation` value (default is *180s*), and provision the changes without any human intervention. @@ -202,4 +202,4 @@ You can see more information about the features of the extension [here](https:// 1. Include a mini overview of the blueprint under the blueprint title (additional sub-header **is not** required). 2. If you need to present (with a picture) a high-level architecture of the blueprint, insert a paragraph under the overview with the name *Solution Design* (additional sub-header **is** required). 3. Include a *Conclusion* paragraph in the end of **every** blueprint as a summary of what we achieved during the process (additional sub-header **is** required). -4. If you want to convey information that the user should not miss or overlook use **always** [adminitions](https://docusaurus.io/docs/markdown-features/admonitions). \ No newline at end of file +4. If you want to convey information that the user should not miss or overlook use **always** [admonitions](https://docusaurus.io/docs/markdown-features/admonitions). From 34076546c9ea7219d5a479d7c78be66f3885b1e1 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Fri, 4 Oct 2024 07:12:13 +0000 Subject: [PATCH 02/26] corrected docusaurus.config.ts #125 --- docusaurus.config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 82abde0a5..3e6dac8c6 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -36,7 +36,7 @@ const config: Config = { { docs: { sidebarPath: './sidebars.ts', - editUrl:'https://github.com/akyriako/docs-next/tree/main/', + editUrl:'https://github.com/opentelekomcloud/docs-next/tree/main/', // showLastUpdateAuthor: true, // showLastUpdateTime: true, breadcrumbs: true, @@ -103,7 +103,7 @@ const config: Config = { "aria-label": 'Open Telekom Cloud Console', }, { - href: 'https://github.com/opentelekomcloud-blueprints', + href: 'https://github.com/opentelekomcloud/docs-next', position: 'right', className: 'navbar--github-link', "aria-label": 'GitHub', @@ -160,7 +160,7 @@ const config: Config = { label: 'Webinars', href: 'https://www.youtube.com/watch?v=U-x2gEy3968&list=PLS60dhorR-hgQ5n5L1boEQh0oVD-_k75p', }, - { + { label: 'Medium', href: 'https://medium.com', }, From a10f4ea3e6cfefc1a741450cdc5c8f605699ca96 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Fri, 4 Oct 2024 12:56:06 +0000 Subject: [PATCH 03/26] paused cross commit to infra for tests #125 --- .github/workflows/release.yaml | 43 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9142b05a6..c439a1dcc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -74,7 +74,7 @@ jobs: # run: echo ${{ steps.docker_build.outputs.digest }} build-stable: - environment: preview + environment: stable runs-on: ubuntu-latest steps: @@ -157,29 +157,26 @@ jobs: with: repository: "${{ vars.DOCS_NEXT_CHARTS_ORG }}/${{ vars.DOCS_NEXT_CHARTS_REPO }}" token: ${{ secrets.DOCS_NEXT_CHARTS_TOKEN }} - - # - name: Show Contents - # run: ls -latr - - name: Update Charts and Commit Changes - id: update_charts - env: - image: ${{ secrets.DOCKERHUB_USERNAME }}\/${{ vars.IMG_NAME }} - run: | - # docusaurus - sed -i 's/^version: .*/version: ${{ vars.APP_VERSION }}.${{github.run_number}}/' ./charts/docusaurus/Chart.yaml - sed -i 's/^appVersion: .*/appVersion: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/Chart.yaml - sed -i 's/^tag: .*/tag: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/values.yaml - sed -i 's/^image: .*/image: ${{ env.image }}/' ./charts/docusaurus/values.yaml - cat ./charts/docusaurus/Chart.yaml - echo "" - echo "---" - echo "" - cat ./charts/docusaurus/values.yaml - # commit and push - git commit -am "Automatic commit from GitHub Actions triggered by action #${{github.run_number}}" - git remote set-url origin https://${{ secrets.DOCS_NEXT_CHARTS_TOKEN }}@github.com/${{ vars.DOCS_NEXT_CHARTS_ORG }}/${{ vars.DOCS_NEXT_CHARTS_REPO }}.git - git push origin main + # - name: Update Charts and Commit Changes + # id: update_charts + # env: + # image: ${{ secrets.DOCKERHUB_USERNAME }}\/${{ vars.IMG_NAME }} + # run: | + # # docusaurus + # sed -i 's/^version: .*/version: ${{ vars.APP_VERSION }}.${{github.run_number}}/' ./charts/docusaurus/Chart.yaml + # sed -i 's/^appVersion: .*/appVersion: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/Chart.yaml + # sed -i 's/^tag: .*/tag: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/values.yaml + # sed -i 's/^image: .*/image: ${{ env.image }}/' ./charts/docusaurus/values.yaml + # cat ./charts/docusaurus/Chart.yaml + # echo "" + # echo "---" + # echo "" + # cat ./charts/docusaurus/values.yaml + # # commit and push + # git commit -am "Automatic commit from GitHub Actions triggered by action #${{github.run_number}}" + # git remote set-url origin https://${{ secrets.DOCS_NEXT_CHARTS_TOKEN }}@github.com/${{ vars.DOCS_NEXT_CHARTS_ORG }}/${{ vars.DOCS_NEXT_CHARTS_REPO }}.git + # git push origin main From e9d80642951dc4a6557ff6ceb080e30ea42d2815 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Fri, 4 Oct 2024 13:08:01 +0000 Subject: [PATCH 04/26] replaced docker hub with quay.io #125 --- .github/workflows/release.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c439a1dcc..d73db5179 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -49,9 +49,10 @@ jobs: UMAMI_DATA_DOMAIN: ${{ vars.UMAMI_DATA_DOMAINS }} run: npm run build - - name: Login to Docker Hub + - name: Login to Quay.io uses: docker/login-action@v3 with: + registry: quay.io username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -69,9 +70,6 @@ jobs: push: true tags: | ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-preview - - # - name: Image Digest - # run: echo ${{ steps.docker_build.outputs.digest }} build-stable: environment: stable @@ -109,9 +107,10 @@ jobs: UMAMI_DATA_DOMAIN: ${{ vars.UMAMI_DATA_DOMAINS }} run: npm run build - - name: Login to Docker Hub + - name: Login to Quay.io uses: docker/login-action@v3 with: + registry: quay.io username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From cc8da2baf134fedc735b55ac5c8fdf3db7381299 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Fri, 4 Oct 2024 13:46:13 +0000 Subject: [PATCH 05/26] fix interpolation issues #125 --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d73db5179..bc73d3fc8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -69,7 +69,7 @@ jobs: file: ./Dockerfile push: true tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-preview + ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-preview build-stable: environment: stable @@ -127,8 +127,8 @@ jobs: file: ./Dockerfile push: true tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:latest - ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-stable + ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:latest + ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-stable # - name: Image Digest # run: echo ${{ steps.docker_build.outputs.digest }} From 662529682b1bf3621b2c70f44893afe93282ab6c Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Sat, 5 Oct 2024 12:53:18 +0200 Subject: [PATCH 06/26] reinstate cross org helm updates in release wf #125 --- .github/workflows/release.yaml | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bc73d3fc8..db7f9d1b7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -157,25 +157,25 @@ jobs: repository: "${{ vars.DOCS_NEXT_CHARTS_ORG }}/${{ vars.DOCS_NEXT_CHARTS_REPO }}" token: ${{ secrets.DOCS_NEXT_CHARTS_TOKEN }} - # - name: Update Charts and Commit Changes - # id: update_charts - # env: - # image: ${{ secrets.DOCKERHUB_USERNAME }}\/${{ vars.IMG_NAME }} - # run: | - # # docusaurus - # sed -i 's/^version: .*/version: ${{ vars.APP_VERSION }}.${{github.run_number}}/' ./charts/docusaurus/Chart.yaml - # sed -i 's/^appVersion: .*/appVersion: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/Chart.yaml - # sed -i 's/^tag: .*/tag: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/values.yaml - # sed -i 's/^image: .*/image: ${{ env.image }}/' ./charts/docusaurus/values.yaml - # cat ./charts/docusaurus/Chart.yaml - # echo "" - # echo "---" - # echo "" - # cat ./charts/docusaurus/values.yaml - # # commit and push - # git commit -am "Automatic commit from GitHub Actions triggered by action #${{github.run_number}}" - # git remote set-url origin https://${{ secrets.DOCS_NEXT_CHARTS_TOKEN }}@github.com/${{ vars.DOCS_NEXT_CHARTS_ORG }}/${{ vars.DOCS_NEXT_CHARTS_REPO }}.git - # git push origin main + - name: Update Charts and Commit Changes + id: update_charts + env: + image: ${{ vars.DOCKERHUB_USERNAME }}\/${{ vars.IMG_NAME }} + run: | + # docusaurus + sed -i 's/^version: .*/version: ${{ vars.APP_VERSION }}.${{github.run_number}}/' ./charts/docusaurus/Chart.yaml + sed -i 's/^appVersion: .*/appVersion: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/Chart.yaml + sed -i 's/^tag: .*/tag: ${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}/' ./charts/docusaurus/values.yaml + sed -i 's/^image: .*/image: ${{ env.image }}/' ./charts/docusaurus/values.yaml + cat ./charts/docusaurus/Chart.yaml + echo "" + echo "---" + echo "" + cat ./charts/docusaurus/values.yaml + # commit and push + git commit -am "Automatic commit from GitHub Actions triggered by action #${{github.run_number}}" + git remote set-url origin https://${{ secrets.DOCS_NEXT_CHARTS_TOKEN }}@github.com/${{ vars.DOCS_NEXT_CHARTS_ORG }}/${{ vars.DOCS_NEXT_CHARTS_REPO }}.git + git push origin main From a6c7e4f7f29784a8e2103d51fca6b0edcc26d10a Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Sat, 5 Oct 2024 13:09:55 +0200 Subject: [PATCH 07/26] split registry from account name in image build #125 --- .github/workflows/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index db7f9d1b7..353d8166e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -69,7 +69,7 @@ jobs: file: ./Dockerfile push: true tags: | - ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-preview + ${{ vars.DOCKERHUB_REGISTRY }}/${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-preview build-stable: environment: stable @@ -127,8 +127,8 @@ jobs: file: ./Dockerfile push: true tags: | - ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:latest - ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-stable + ${{ vars.DOCKERHUB_REGISTRY }}/${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:latest + ${{ vars.DOCKERHUB_REGISTRY }}/${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMG_NAME }}:${{ vars.APP_VERSION }}.${{github.run_number}}-${{ steps.commit_hash.outputs.short }}-stable # - name: Image Digest # run: echo ${{ steps.docker_build.outputs.digest }} @@ -160,7 +160,7 @@ jobs: - name: Update Charts and Commit Changes id: update_charts env: - image: ${{ vars.DOCKERHUB_USERNAME }}\/${{ vars.IMG_NAME }} + image: ${{ vars.DOCKERHUB_REGISTRY }}\/${{ vars.DOCKERHUB_USERNAME }}\/${{ vars.IMG_NAME }} run: | # docusaurus sed -i 's/^version: .*/version: ${{ vars.APP_VERSION }}.${{github.run_number}}/' ./charts/docusaurus/Chart.yaml From 5d5611a0a484aa7e3c07e50e929c60050d44947b Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Tue, 8 Oct 2024 09:17:26 +0000 Subject: [PATCH 08/26] typo fix, fake --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 3e6dac8c6..bf7031b4c 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -5,7 +5,7 @@ import type { Options as UmamiOptions } from '@dipakparmar/docusaurus-plugin-uma const config: Config = { title: 'Architecture Center', - tagline: 'Best Practices & Blueprints', + tagline: 'Best Practices and Blueprints', favicon: 'img/favicon.ico', // Set the production url of your site here From b2c03c933eec61fcd38fc8552cf729f716b9dbc8 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Tue, 8 Oct 2024 10:59:41 +0000 Subject: [PATCH 09/26] refresh ts search key for preview --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index bf7031b4c..3e6dac8c6 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -5,7 +5,7 @@ import type { Options as UmamiOptions } from '@dipakparmar/docusaurus-plugin-uma const config: Config = { title: 'Architecture Center', - tagline: 'Best Practices and Blueprints', + tagline: 'Best Practices & Blueprints', favicon: 'img/favicon.ico', // Set the production url of your site here From 196026ec12f13534f1ae4c9752ef1f67707714e2 Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Tue, 8 Oct 2024 11:15:21 +0000 Subject: [PATCH 10/26] fake fix to rebake images --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 3e6dac8c6..bf7031b4c 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -5,7 +5,7 @@ import type { Options as UmamiOptions } from '@dipakparmar/docusaurus-plugin-uma const config: Config = { title: 'Architecture Center', - tagline: 'Best Practices & Blueprints', + tagline: 'Best Practices and Blueprints', favicon: 'img/favicon.ico', // Set the production url of your site here From f7da5ac013dbbd95616a5e72d144c66080914a7c Mon Sep 17 00:00:00 2001 From: Kyriakos Akriotis Date: Wed, 9 Oct 2024 07:57:23 +0000 Subject: [PATCH 11/26] fake fix to rebake search api key for stable --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index bf7031b4c..3e6dac8c6 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -5,7 +5,7 @@ import type { Options as UmamiOptions } from '@dipakparmar/docusaurus-plugin-uma const config: Config = { title: 'Architecture Center', - tagline: 'Best Practices and Blueprints', + tagline: 'Best Practices & Blueprints', favicon: 'img/favicon.ico', // Set the production url of your site here From c4805775701ccd4b2176e9a7cc6c76e208ecd99f Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 11 Oct 2024 08:47:25 +0000 Subject: [PATCH 12/26] respect system color scheme and keep Scale and Docusaurus in sync --- docusaurus.config.ts | 13 ++++++--- package-lock.json | 9 ------ src/css/custom.css | 10 +++---- src/theme/Navbar/ColorModeToggle/index.tsx | 32 ++++++++++++++++++++-- yarn.lock | 7 +---- 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 3e6dac8c6..ca6a41896 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -63,6 +63,11 @@ const config: Config = { themeConfig: { // Replace with your project's social card image: 'img/open-telekom-cloud-social-card.png', + colorMode: { + defaultMode: "light", + disableSwitch: false, + respectPrefersColorScheme: true, + }, navbar: { // title: 't', logo: { @@ -215,10 +220,10 @@ const config: Config = { ], copyright: `© T-Systems International GmbH ${new Date().getFullYear()} (v` + process.env.REACT_APP_VERSION + `)`, }, - prism: { - theme: prismThemes.oneDark, - darkTheme: prismThemes.oneDark, - }, + // prism: { + // theme: prismThemes.oneDark, + // darkTheme: prismThemes.oneDark, + // }, docs: { sidebar: { hideable: false, diff --git a/package-lock.json b/package-lock.json index bbee6dfb8..bb18e6eac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2781,15 +2781,6 @@ "@hapi/hoek": "^9.0.0" } }, - "node_modules/@heroicons/react": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.1.5.tgz", - "integrity": "sha512-FuzFN+BsHa+7OxbvAERtgBTNeZpUjgM/MIizfVkSCL2/edriN0Hx/DWRCR//aPYwO5QX/YlgLGXk+E3PcfZwjA==", - "license": "MIT", - "peerDependencies": { - "react": ">= 16" - } - }, "node_modules/@jest/schemas": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", diff --git a/src/css/custom.css b/src/css/custom.css index 2f56b2e18..6f27d2e91 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -41,13 +41,12 @@ html[data-theme='light'] { --ifm-footer-link-color: black; --ifm-code-font-size: 95%; --ifm-font-family-base: 'TeleNeoWeb'; - --ifm-background-color: #ffffff; - --ifm-background-surface-color: #ffffff; + --ifm-background-color: var(--telekom-color-background-canvas-subtle); + --ifm-background-surface-color: var(--telekom-color-background-surface); --background: #ffffff; --telekom-shadow-raised-standard: none; --telekom-radius-large: 2rem; - --telekom-color-background-surface: var(--ifm-background-surface-color); --telekom-shadow-raised-hover: 0px 16px 64px 0px hsla(0, 0%, 0%, 0.1), 0px 8px 16px 0px hsla(0, 0%, 0%, 0.1); } @@ -59,13 +58,12 @@ html[data-theme='dark'] { --ifm-color-primary-light: #a1b1fb; --ifm-color-primary-lighter: #b3c0fb; --ifm-color-primary-lightest: #e8ecfe; - --ifm-background-color: #1d1d1b; - --ifm-background-surface-color: #1b1b1d; + --ifm-background-color: var(--telekom-color-background-canvas-subtle); + --ifm-background-surface-color: var(--telekom-color-background-surface); --background: #000000; --telekom-shadow-raised-standard: none; --telekom-radius-large: 2rem; - --telekom-color-background-surface: var(--ifm-background-surface-color); --telekom-shadow-raised-hover: 0px 16px 64px 0px #e20074, 0px 8px 16px 0px #e20074; } diff --git a/src/theme/Navbar/ColorModeToggle/index.tsx b/src/theme/Navbar/ColorModeToggle/index.tsx index b0d400777..cb39630bf 100644 --- a/src/theme/Navbar/ColorModeToggle/index.tsx +++ b/src/theme/Navbar/ColorModeToggle/index.tsx @@ -1,15 +1,38 @@ import React from 'react'; -import {useColorMode, useThemeConfig} from '@docusaurus/theme-common'; +import {useThemeConfig} from '@docusaurus/theme-common'; import ColorModeToggle from '@theme/ColorModeToggle'; import type {Props} from '@theme/Navbar/ColorModeToggle'; import styles from './styles.module.css'; +import { useColorMode as originalUseColorMode } from '@docusaurus/theme-common'; +import { useEffect } from 'react'; + +// Create a custom hook that extends the original useColorMode for Scale +export function useColorModeWithScale() { + const { colorMode, setColorMode } = originalUseColorMode(); + + const toggleScaleColorMode = (newMode) => { + document.body.dataset.mode = newMode + }; + + useEffect(() => { + // On component mount, sync the initial color mode between Docusaurus and Scale + toggleScaleColorMode(colorMode); + }, [colorMode]); + + return { + colorMode, + setColorMode, + toggleScaleColorMode, + }; +} + export default function NavbarColorModeToggle({ className, }: Props): JSX.Element | null { const navbarStyle = useThemeConfig().navbar.style; const disabled = useThemeConfig().colorMode.disableSwitch; - const {colorMode, setColorMode} = useColorMode(); + const {colorMode, setColorMode, toggleScaleColorMode} = useColorModeWithScale(); if (disabled) { return null; @@ -22,7 +45,10 @@ export default function NavbarColorModeToggle({ navbarStyle === 'dark' ? styles.darkNavbarColorModeToggle : undefined } value={colorMode} - onChange={setColorMode} + onChange={(newMode) => { + setColorMode(newMode); + toggleScaleColorMode(newMode); + }} /> ); } diff --git a/yarn.lock b/yarn.lock index ea424f9b8..a1a21202b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1724,11 +1724,6 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@heroicons/react@^2.1.5": - version "2.1.5" - resolved "https://registry.npmjs.org/@heroicons/react/-/react-2.1.5.tgz" - integrity sha512-FuzFN+BsHa+7OxbvAERtgBTNeZpUjgM/MIizfVkSCL2/edriN0Hx/DWRCR//aPYwO5QX/YlgLGXk+E3PcfZwjA== - "@jest/schemas@^29.6.3": version "29.6.3" resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz" @@ -7159,7 +7154,7 @@ react-router@^5.3.4, react-router@>=5, react-router@5.3.4: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react@*, "react@^16.13.1 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || ^17.0.0 || ^18.0.0", react@^18.0.0, react@^18.3.1, "react@>= 16", "react@>= 16.8.0 < 19.0.0", react@>=15, react@>=16, react@>=16.0.0: +react@*, "react@^16.13.1 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || ^17.0.0 || ^18.0.0", react@^18.0.0, react@^18.3.1, "react@>= 16.8.0 < 19.0.0", react@>=15, react@>=16, react@>=16.0.0: version "18.3.1" resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz" integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== From 3bf0123276eae618f0aa350dab582bb4d9d19289 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 11 Oct 2024 09:50:28 +0000 Subject: [PATCH 13/26] Startpage colors --- docusaurus.config.ts | 8 ++++---- src/components/HomepageAskAQuestion/styles.module.css | 4 ++-- src/components/HomepageContribute/styles.module.css | 4 ++-- src/components/HomepageFeaturedServices/styles.module.css | 4 ++-- src/components/ServiceCallouts/styles.modules.css | 3 ++- src/css/custom.css | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index ca6a41896..3dff3850f 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -220,10 +220,10 @@ const config: Config = { ], copyright: `© T-Systems International GmbH ${new Date().getFullYear()} (v` + process.env.REACT_APP_VERSION + `)`, }, - // prism: { - // theme: prismThemes.oneDark, - // darkTheme: prismThemes.oneDark, - // }, + prism: { + theme: prismThemes.oneDark, + darkTheme: prismThemes.oneDark, + }, docs: { sidebar: { hideable: false, diff --git a/src/components/HomepageAskAQuestion/styles.module.css b/src/components/HomepageAskAQuestion/styles.module.css index 2d8f36204..693587131 100644 --- a/src/components/HomepageAskAQuestion/styles.module.css +++ b/src/components/HomepageAskAQuestion/styles.module.css @@ -1,7 +1,7 @@ .item { box-shadow: 0 1px 3px gray; - background-color: var(--ifm-background-color); + background-color: var(--telekom-color-background-surface); border-radius: 2rem; color: black; overflow: hidden; @@ -9,7 +9,7 @@ html[data-theme='dark'] .item { box-shadow: 0px 1px 3px var(--ifm-color-primary); - background-color: var(--ifm-background-color); + background-color: var(--telekom-color-background-surface); border-radius: 2rem; color: white; overflow: hidden; diff --git a/src/components/HomepageContribute/styles.module.css b/src/components/HomepageContribute/styles.module.css index 2d8f36204..693587131 100644 --- a/src/components/HomepageContribute/styles.module.css +++ b/src/components/HomepageContribute/styles.module.css @@ -1,7 +1,7 @@ .item { box-shadow: 0 1px 3px gray; - background-color: var(--ifm-background-color); + background-color: var(--telekom-color-background-surface); border-radius: 2rem; color: black; overflow: hidden; @@ -9,7 +9,7 @@ html[data-theme='dark'] .item { box-shadow: 0px 1px 3px var(--ifm-color-primary); - background-color: var(--ifm-background-color); + background-color: var(--telekom-color-background-surface); border-radius: 2rem; color: white; overflow: hidden; diff --git a/src/components/HomepageFeaturedServices/styles.module.css b/src/components/HomepageFeaturedServices/styles.module.css index 2d8f36204..693587131 100644 --- a/src/components/HomepageFeaturedServices/styles.module.css +++ b/src/components/HomepageFeaturedServices/styles.module.css @@ -1,7 +1,7 @@ .item { box-shadow: 0 1px 3px gray; - background-color: var(--ifm-background-color); + background-color: var(--telekom-color-background-surface); border-radius: 2rem; color: black; overflow: hidden; @@ -9,7 +9,7 @@ html[data-theme='dark'] .item { box-shadow: 0px 1px 3px var(--ifm-color-primary); - background-color: var(--ifm-background-color); + background-color: var(--telekom-color-background-surface); border-radius: 2rem; color: white; overflow: hidden; diff --git a/src/components/ServiceCallouts/styles.modules.css b/src/components/ServiceCallouts/styles.modules.css index b8a299a8e..8ca9cf28e 100644 --- a/src/components/ServiceCallouts/styles.modules.css +++ b/src/components/ServiceCallouts/styles.modules.css @@ -17,6 +17,7 @@ } */ .callout { position: relative; + background-color: var(--telekom-color-background-surface-subtle); } .callout__title { align-items: center; @@ -60,7 +61,7 @@ html[data-theme='dark'] .callout__shadow { box-shadow: unset; - background-color: #1b1b1d; + background-color: var(--telekom-color-background-surface-subtle); } .video { diff --git a/src/css/custom.css b/src/css/custom.css index 6f27d2e91..161f57863 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -44,7 +44,7 @@ html[data-theme='light'] { --ifm-background-color: var(--telekom-color-background-canvas-subtle); --ifm-background-surface-color: var(--telekom-color-background-surface); - --background: #ffffff; + /* --background: #ffffff; */ --telekom-shadow-raised-standard: none; --telekom-radius-large: 2rem; --telekom-shadow-raised-hover: 0px 16px 64px 0px hsla(0, 0%, 0%, 0.1), 0px 8px 16px 0px hsla(0, 0%, 0%, 0.1); @@ -61,7 +61,7 @@ html[data-theme='dark'] { --ifm-background-color: var(--telekom-color-background-canvas-subtle); --ifm-background-surface-color: var(--telekom-color-background-surface); - --background: #000000; + /* --background: #000000; */ --telekom-shadow-raised-standard: none; --telekom-radius-large: 2rem; --telekom-shadow-raised-hover: 0px 16px 64px 0px #e20074, 0px 8px 16px 0px #e20074; From 29afdbb3a91f4d69fb1618737aa271890fdd82be Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 11 Oct 2024 11:30:17 +0000 Subject: [PATCH 14/26] Fix light mode system setting with manual dark mode --- src/theme/Navbar/ColorModeToggle/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/theme/Navbar/ColorModeToggle/index.tsx b/src/theme/Navbar/ColorModeToggle/index.tsx index cb39630bf..241b35a34 100644 --- a/src/theme/Navbar/ColorModeToggle/index.tsx +++ b/src/theme/Navbar/ColorModeToggle/index.tsx @@ -10,9 +10,8 @@ import { useEffect } from 'react'; // Create a custom hook that extends the original useColorMode for Scale export function useColorModeWithScale() { const { colorMode, setColorMode } = originalUseColorMode(); - const toggleScaleColorMode = (newMode) => { - document.body.dataset.mode = newMode + document.documentElement.dataset.mode = newMode }; useEffect(() => { From ba671fde2660c75d6118239ece024ec1a776a04e Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:13:13 +0000 Subject: [PATCH 15/26] try initial script --- docusaurus.config.ts | 6 ++++++ src/pages/index.tsx | 3 ++- static/js/update_color.js | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 static/js/update_color.js diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 3dff3850f..91d4b76ba 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -68,6 +68,12 @@ const config: Config = { disableSwitch: false, respectPrefersColorScheme: true, }, + scripts: [ + { + src: '/js/update_color.js', + async: false, + } + ], navbar: { // title: 't', logo: { diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 38bf6d9c5..ea88efccf 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -38,7 +38,8 @@ export default function Home(): JSX.Element { return ( + description={`${siteConfig.title}`} + > {/* */}
diff --git a/static/js/update_color.js b/static/js/update_color.js new file mode 100644 index 000000000..925689ca2 --- /dev/null +++ b/static/js/update_color.js @@ -0,0 +1,23 @@ +import { useColorMode as originalUseColorMode } from '@docusaurus/theme-common'; +import { useEffect } from 'react'; + +// Create a custom hook that extends the original useColorMode for Scale +export function useColorModeWithScale() { + const { colorMode, setColorMode } = originalUseColorMode(); + const toggleScaleColorMode = (newMode) => { + document.documentElement.dataset.mode = newMode + }; + + useEffect(() => { + // On component mount, sync the initial color mode between Docusaurus and Scale + toggleScaleColorMode(colorMode); + }, [colorMode]); + + return { + colorMode, + setColorMode, + toggleScaleColorMode, + }; +} + +useColorModeWithScale(); \ No newline at end of file From eb7007ed7c2d28a1b594b7b22ea48ed627604781 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:28:45 +0000 Subject: [PATCH 16/26] other fix for flickering --- docusaurus.config.ts | 29 ++++++++++++++++++++++------- static/js/update_color.js | 23 ----------------------- 2 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 static/js/update_color.js diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 91d4b76ba..419f1f864 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -68,12 +68,6 @@ const config: Config = { disableSwitch: false, respectPrefersColorScheme: true, }, - scripts: [ - { - src: '/js/update_color.js', - async: false, - } - ], navbar: { // title: 't', logo: { @@ -264,6 +258,27 @@ const config: Config = { customFields: { version: `(v` + process.env.REACT_APP_VERSION + `)`, + injectHtmlTags() { + return { + headTags: [ + { + tagName: 'script', + innerHTML: ` + (function() { + try { + const userPref = localStorage.getItem('theme'); + const systemPref = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; + const mode = userPref || systemPref; + document.documentElement.setAttribute('data-mode', mode); + } catch (e) { + console.error('Error setting data-mode:', e); + } + })(); + `, + }, + ], + }; + } }, plugins: [ @@ -279,7 +294,7 @@ const config: Config = { dataDomains: process.env.UMAMI_DATA_DOMAIN, // comma separated list of domains, *Recommended* } as UmamiOptions, ], - ], + ] }; export default config; \ No newline at end of file diff --git a/static/js/update_color.js b/static/js/update_color.js deleted file mode 100644 index 925689ca2..000000000 --- a/static/js/update_color.js +++ /dev/null @@ -1,23 +0,0 @@ -import { useColorMode as originalUseColorMode } from '@docusaurus/theme-common'; -import { useEffect } from 'react'; - -// Create a custom hook that extends the original useColorMode for Scale -export function useColorModeWithScale() { - const { colorMode, setColorMode } = originalUseColorMode(); - const toggleScaleColorMode = (newMode) => { - document.documentElement.dataset.mode = newMode - }; - - useEffect(() => { - // On component mount, sync the initial color mode between Docusaurus and Scale - toggleScaleColorMode(colorMode); - }, [colorMode]); - - return { - colorMode, - setColorMode, - toggleScaleColorMode, - }; -} - -useColorModeWithScale(); \ No newline at end of file From 1b41c0ead4e7e8dcca39f2dce7ba8cc08a508c90 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:35:58 +0000 Subject: [PATCH 17/26] third try --- docusaurus.config.ts | 22 +--------------------- plugins/html-tags/index.js | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 plugins/html-tags/index.js diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 419f1f864..cad28e1ec 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -258,27 +258,6 @@ const config: Config = { customFields: { version: `(v` + process.env.REACT_APP_VERSION + `)`, - injectHtmlTags() { - return { - headTags: [ - { - tagName: 'script', - innerHTML: ` - (function() { - try { - const userPref = localStorage.getItem('theme'); - const systemPref = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; - const mode = userPref || systemPref; - document.documentElement.setAttribute('data-mode', mode); - } catch (e) { - console.error('Error setting data-mode:', e); - } - })(); - `, - }, - ], - }; - } }, plugins: [ @@ -294,6 +273,7 @@ const config: Config = { dataDomains: process.env.UMAMI_DATA_DOMAIN, // comma separated list of domains, *Recommended* } as UmamiOptions, ], + require.resolve('./plugins/html-tags'), ] }; diff --git a/plugins/html-tags/index.js b/plugins/html-tags/index.js new file mode 100644 index 000000000..874435b8a --- /dev/null +++ b/plugins/html-tags/index.js @@ -0,0 +1,26 @@ +module.exports = function () { + return { + name: 'inject-html-tags-plugin', + injectHtmlTags() { + return { + headTags: [ + { + tagName: 'script', + innerHTML: ` + (function() { + try { + const userPref = localStorage.getItem('theme'); + const systemPref = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; + const mode = userPref || systemPref; + document.documentElement.setAttribute('data-mode', mode); + } catch (e) { + console.error('Error setting data-mode:', e); + } + })(); + `, + }, + ], + }; + }, + }; + }; \ No newline at end of file From f57917cf7184852a51d9b120d8ec01c52557b55f Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:43:00 +0000 Subject: [PATCH 18/26] next try --- src/css/custom.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/css/custom.css b/src/css/custom.css index 161f57863..9de5e1f2e 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -29,6 +29,14 @@ --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.3); } */ :root, +html { + display: none; /* Hide until the correct theme is applied */ +} + +html[data-mode] { + display: block; /* Show after the correct theme is set */ +} + html[data-theme='light'] { --ifm-color-primary: #e20074; --ifm-color-primary-dark: #cb0068; From b8011ac5d68e5e837ee9b93ef35acfaad20732df Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:45:44 +0000 Subject: [PATCH 19/26] remove plugin --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index cad28e1ec..69796caf3 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -273,7 +273,7 @@ const config: Config = { dataDomains: process.env.UMAMI_DATA_DOMAIN, // comma separated list of domains, *Recommended* } as UmamiOptions, ], - require.resolve('./plugins/html-tags'), + // require.resolve('./plugins/html-tags'), ] }; From 6ee53e9debce7c42507bbbd06163cb4bfb6b431b Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:48:15 +0000 Subject: [PATCH 20/26] Remove useless code --- plugins/html-tags/index.js | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 plugins/html-tags/index.js diff --git a/plugins/html-tags/index.js b/plugins/html-tags/index.js deleted file mode 100644 index 874435b8a..000000000 --- a/plugins/html-tags/index.js +++ /dev/null @@ -1,26 +0,0 @@ -module.exports = function () { - return { - name: 'inject-html-tags-plugin', - injectHtmlTags() { - return { - headTags: [ - { - tagName: 'script', - innerHTML: ` - (function() { - try { - const userPref = localStorage.getItem('theme'); - const systemPref = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'; - const mode = userPref || systemPref; - document.documentElement.setAttribute('data-mode', mode); - } catch (e) { - console.error('Error setting data-mode:', e); - } - })(); - `, - }, - ], - }; - }, - }; - }; \ No newline at end of file From e6b7fe1b8f51dee3acfc78ecbd26e930a556c3d3 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:48:48 +0000 Subject: [PATCH 21/26] Remove comment --- docusaurus.config.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 69796caf3..4c5c87a80 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -273,7 +273,6 @@ const config: Config = { dataDomains: process.env.UMAMI_DATA_DOMAIN, // comma separated list of domains, *Recommended* } as UmamiOptions, ], - // require.resolve('./plugins/html-tags'), ] }; From 7187346aabfca80ce9175f682a453ac4d64a0bc6 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:49:15 +0000 Subject: [PATCH 22/26] rever index.tsx --- src/pages/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/index.tsx b/src/pages/index.tsx index ea88efccf..38bf6d9c5 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -38,8 +38,7 @@ export default function Home(): JSX.Element { return ( + description={`${siteConfig.title}`}> {/* */}
From c513b32725136cb005a5d70acb81b4e83912f9cc Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:49:41 +0000 Subject: [PATCH 23/26] add comma --- docusaurus.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 4c5c87a80..3dff3850f 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -273,7 +273,7 @@ const config: Config = { dataDomains: process.env.UMAMI_DATA_DOMAIN, // comma separated list of domains, *Recommended* } as UmamiOptions, ], - ] + ], }; export default config; \ No newline at end of file From 198cc219a565dc4319a04139ee9fddffbbf3d373 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 07:55:57 +0000 Subject: [PATCH 24/26] Change background color --- src/css/custom.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/css/custom.css b/src/css/custom.css index 9de5e1f2e..7c0888f5e 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -49,7 +49,7 @@ html[data-theme='light'] { --ifm-footer-link-color: black; --ifm-code-font-size: 95%; --ifm-font-family-base: 'TeleNeoWeb'; - --ifm-background-color: var(--telekom-color-background-canvas-subtle); + --ifm-background-color: #fbfbfb; --ifm-background-surface-color: var(--telekom-color-background-surface); /* --background: #ffffff; */ @@ -66,7 +66,7 @@ html[data-theme='dark'] { --ifm-color-primary-light: #a1b1fb; --ifm-color-primary-lighter: #b3c0fb; --ifm-color-primary-lightest: #e8ecfe; - --ifm-background-color: var(--telekom-color-background-canvas-subtle); + --ifm-background-color: #0e0e0f; --ifm-background-surface-color: var(--telekom-color-background-surface); /* --background: #000000; */ From 74d58da65dcede1cb997c6985e38a9cd4d965dd1 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 08:15:08 +0000 Subject: [PATCH 25/26] fix flicker --- src/css/custom.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/css/custom.css b/src/css/custom.css index 7c0888f5e..7f8a0c5c9 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -76,12 +76,12 @@ html[data-theme='dark'] { } /* Override system color scheme preference */ -@media (prefers-color-scheme: dark) { +/* @media (prefers-color-scheme: dark) { html[data-theme='light'] { --ifm-background-color: #ffffff; --ifm-background-surface-color: #ffffff; } -} +} */ @media screen and (max-width: 996px) { From 54c382a76a1f12668c058531e10697f555de38e8 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Tue, 15 Oct 2024 08:45:02 +0000 Subject: [PATCH 26/26] Fix font --- src/css/custom.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/css/custom.css b/src/css/custom.css index 7f8a0c5c9..8a0c86db9 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -66,6 +66,7 @@ html[data-theme='dark'] { --ifm-color-primary-light: #a1b1fb; --ifm-color-primary-lighter: #b3c0fb; --ifm-color-primary-lightest: #e8ecfe; + --ifm-font-family-base: 'TeleNeoWeb'; --ifm-background-color: #0e0e0f; --ifm-background-surface-color: var(--telekom-color-background-surface);