From 4aee40bcc8d2a2324a1980f03d661d8ebe94c080 Mon Sep 17 00:00:00 2001 From: Karl Kemister-Sheppard Date: Mon, 3 Mar 2025 11:07:41 +1000 Subject: [PATCH] Remove dark mode detection and set skin to in demo examples; update release notes formatting issue. --- modules/ROOT/examples/live-demos/full-featured/example.js | 4 +--- modules/ROOT/examples/live-demos/full-featured/index.js | 4 +--- modules/ROOT/pages/7.7.0-release-notes.adoc | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/ROOT/examples/live-demos/full-featured/example.js b/modules/ROOT/examples/live-demos/full-featured/example.js index 109bcccdbe..7f03b19dfd 100644 --- a/modules/ROOT/examples/live-demos/full-featured/example.js +++ b/modules/ROOT/examples/live-demos/full-featured/example.js @@ -6,7 +6,6 @@ const fetchApi = import( // Instead, an alternate method for retrieving the API key should be used. const openai_api_key = ""; -const useDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches; const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches; tinymce.init({ @@ -111,8 +110,7 @@ tinymce.init({ content_style: '.mymention{ color: gray; }', contextmenu: 'link image editimage table configurepermanentpen', a11y_advanced_options: true, - skin: useDarkMode ? 'oxide-dark' : 'oxide', - content_css: useDarkMode ? 'dark' : 'default', + skin: 'oxide-dark', autocorrect_capitalize: true, mergetags_list: [ { diff --git a/modules/ROOT/examples/live-demos/full-featured/index.js b/modules/ROOT/examples/live-demos/full-featured/index.js index 3ceb31f729..d953e01080 100644 --- a/modules/ROOT/examples/live-demos/full-featured/index.js +++ b/modules/ROOT/examples/live-demos/full-featured/index.js @@ -141,7 +141,6 @@ tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/fak }); }; - const useDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches; const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches; const ai_request = (request, respondWith) => { @@ -523,8 +522,7 @@ tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/fak 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }', contextmenu: 'link image editimage table spellchecker configurepermanentpen', a11y_advanced_options: true, - skin: useDarkMode ? 'oxide-dark' : 'oxide', - content_css: useDarkMode ? 'dark' : 'default', + skin: 'oxide-dark', mentions_selector: '.mymention', mentions_fetch: mentions_fetch, mentions_menu_hover: mentions_menu_hover, diff --git a/modules/ROOT/pages/7.7.0-release-notes.adoc b/modules/ROOT/pages/7.7.0-release-notes.adoc index 3fff8873dc..13b1a5dd27 100644 --- a/modules/ROOT/pages/7.7.0-release-notes.adoc +++ b/modules/ROOT/pages/7.7.0-release-notes.adoc @@ -242,7 +242,7 @@ For information on the **Accessibility Checker** plugin, see: xref:a11ychecker.a {productname} {release-version} also includes the following improvements: -==== Improved visual indication of keyboard focus for a comment annotation when there is an image inside. +=== Improved visual indication of keyboard focus for a comment annotation when there is an image inside. // #TINY-11596 In previous versions of **Comments**, annotated non-text elements occasionally displayed a double bottom border when selected, leading to a visual inconsistency that appeared buggy and clashed with existing border styles.