From a7f302640762ffd9d1cb515c4dc659a9be4b354d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Sun, 6 Aug 2023 09:39:43 +0200 Subject: [PATCH] small cleanup --- js/mage/adminhtml/wysiwyg/tinymce/setup.js | 8 +- .../themes/advanced/skins/default/content.css | 32 -------- .../themes/advanced/skins/default/dialog.css | 76 ------------------- 3 files changed, 1 insertion(+), 115 deletions(-) delete mode 100644 js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/content.css delete mode 100644 js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/dialog.css diff --git a/js/mage/adminhtml/wysiwyg/tinymce/setup.js b/js/mage/adminhtml/wysiwyg/tinymce/setup.js index 652fef8244a..7be5951c162 100644 --- a/js/mage/adminhtml/wysiwyg/tinymce/setup.js +++ b/js/mage/adminhtml/wysiwyg/tinymce/setup.js @@ -94,19 +94,13 @@ tinyMceWysiwygSetup.prototype = promotion: false, convert_urls: false, relative_urls: true, - // TODO - // Possible values: oxide (default), oxide-dark, tinymce-5, tinymce-5-dark - skin: 'oxide-dark', - // TODO: why load this custom css? propose to delete all themes/advanced/skins/default/*.css - // https://www.tiny.cloud/docs/tinymce/6/add-css-options/#content_css - //content_css: this.config.content_css, + skin: 'oxide', urlconverter_callback: (url, node, on_save, name) => { // some callback here to convert urls //url = this.decodeContent(url); return url; }, setup: (editor) => { - var onChange; editor.on('BeforeSetContent', function (evt) { diff --git a/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/content.css b/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/content.css deleted file mode 100644 index e6293e9b109..00000000000 --- a/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/content.css +++ /dev/null @@ -1,32 +0,0 @@ -/** - * OpenMage - * - * This source file is subject to the Academic Free License (AFL 3.0) - * that is bundled with this package in the file LICENSE_AFL.txt. - * It is also available at https://opensource.org/license/afl-3-0-php - * - * @category Mage - * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org) - * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - */ - -body, td, pre { color:#2f2f2f; font-family:Arial, Helvetica, sans-serif; font-size:12px; margin:8px; } -body { background:#fff; } -body.mceForceColors { background:#fff; color:#2f2f2f; } -h1 {font-size: 2em} -h2 {font-size: 1.5em} -h3 {font-size: 1.17em} -h4 {font-size: 1em} -h5 {font-size: .83em} -h6 {font-size: .75em} -.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} -img {border:0; vertical-align:middle; } -table {cursor:default} -table td, table th {cursor:text} -ins {border-bottom:1px solid green; text-decoration: none; color:green} -del {color:red; text-decoration:line-through} -cite {border-bottom:1px dashed blue} -acronym {border-bottom:1px dotted #CCC; cursor:help} -abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help} diff --git a/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/dialog.css b/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/dialog.css deleted file mode 100644 index a7677718523..00000000000 --- a/js/mage/adminhtml/wysiwyg/tinymce/themes/advanced/skins/default/dialog.css +++ /dev/null @@ -1,76 +0,0 @@ -/** - * OpenMage - * - * This source file is subject to the Academic Free License (AFL 3.0) - * that is bundled with this package in the file LICENSE_AFL.txt. - * It is also available at https://opensource.org/license/afl-3-0-php - * - * @category Mage - * @package Mage_Adminhtml - * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org) - * @license https://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) - */ - -/* Browse */ -a.pickcolor, a.browse {text-decoration:none} -a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;} -.mceOldBoxModel a.browse span {width:22px; height:20px;} -a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} -a.browse span.disabled {border:1px solid white; opacity:0.3;} -a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} -a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;} -.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} -a.pickcolor:hover span {background-color:#B2BBD0;} -a.pickcolor:hover span.disabled {} - -/* Charmap */ -table.charmap {border:1px solid #AAA; text-align:center} -td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} -#charmap a {display:block; color:#000; text-decoration:none; border:0} -#charmap a:hover {background:#CCC;color:#2B6FB6} -#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} -#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} - -/* Source */ -.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} -.mceActionPanel {margin-top:5px;} - -/* Tabs classes */ -.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;} -.tabs ul {margin:0; padding:0; list-style:none;} -.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} -.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;} -.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;} -.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;} -.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} -.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} - -/* Panels */ -.panel_wrapper div.panel {display:none;} -.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} -.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} - -/* Columns */ -.column {float:left;} -.properties {width:100%;} -.properties .column1 {} -.properties .column2 {text-align:left;} - -/* Dialog specific */ -#link .panel_wrapper, #link div.current {height:125px;} -#image .panel_wrapper, #image div.current {height:200px;} -#plugintable thead {font-weight:bold; background:#DDD;} -#plugintable, #about #plugintable td {border:1px solid #919B9C;} -#plugintable {width:96%; margin-top:10px;} -#pluginscontainer {height:290px; overflow:auto;} -#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;} -#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} -#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} -#colorpicker #light div {overflow:hidden;} -#colorpicker #previewblock {float:right; padding-left:10px; height:20px;} -#colorpicker .panel_wrapper div.current {height:175px;} -#colorpicker #namedcolors {width:150px;} -#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} -#colorpicker #colornamecontainer {margin-top:5px;} -#colorpicker #picker_panel fieldset {margin:auto;width:325px;}