Skip to content

Commit 74930c1

Browse files
committed
Revert "DOC-3143: Remove dark mode detection and set skin to oxide-dark in demo examples; update release notes formatting issue."
This reverts commit df31f31.
1 parent df31f31 commit 74930c1

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

modules/ROOT/examples/live-demos/full-featured/example.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const fetchApi = import(
66
// Instead, an alternate method for retrieving the API key should be used.
77
const openai_api_key = "<INSERT_OPENAI_API_KEY_HERE>";
88

9+
const useDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
910
const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches;
1011

1112
tinymce.init({
@@ -110,7 +111,8 @@ tinymce.init({
110111
content_style: '.mymention{ color: gray; }',
111112
contextmenu: 'link image editimage table configurepermanentpen',
112113
a11y_advanced_options: true,
113-
skin: 'oxide-dark',
114+
skin: useDarkMode ? 'oxide-dark' : 'oxide',
115+
content_css: useDarkMode ? 'dark' : 'default',
114116
autocorrect_capitalize: true,
115117
mergetags_list: [
116118
{

modules/ROOT/examples/live-demos/full-featured/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/fak
141141
});
142142
};
143143

144+
const useDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
144145
const isSmallScreen = window.matchMedia('(max-width: 1023.5px)').matches;
145146

146147
const ai_request = (request, respondWith) => {
@@ -522,7 +523,8 @@ tinymce.ScriptLoader.loadScripts(['https://cdn.jsdelivr.net/npm/faker@5/dist/fak
522523
'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }',
523524
contextmenu: 'link image editimage table spellchecker configurepermanentpen',
524525
a11y_advanced_options: true,
525-
skin: 'oxide-dark',
526+
skin: useDarkMode ? 'oxide-dark' : 'oxide',
527+
content_css: useDarkMode ? 'dark' : 'default',
526528
mentions_selector: '.mymention',
527529
mentions_fetch: mentions_fetch,
528530
mentions_menu_hover: mentions_menu_hover,

modules/ROOT/pages/7.7.0-release-notes.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ For information on the **Accessibility Checker** plugin, see: xref:a11ychecker.a
242242

243243
{productname} {release-version} also includes the following improvements:
244244

245-
=== Improved visual indication of keyboard focus for a comment annotation when there is an image inside.
245+
==== Improved visual indication of keyboard focus for a comment annotation when there is an image inside.
246246
// #TINY-11596
247247

248248
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.

0 commit comments

Comments
 (0)