Changes in [3680:57c79fd7f152:3683:51eaa1079bde]

Files:

• .hgignore (modified) (1 diff)
• .hgsigs (modified) (1 diff)
• .hgtags (modified) (1 diff)
• admin/style/default.css (modified) (3 diffs)
• admin/style/scss/default.scss (modified) (1 diff)
• admin/style/scss/partials/_content.scss (modified) (1 diff)
• admin/style/scss/partials/_editors.scss (added)
• composer.json (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• plugins/dcCKEditor/_post_config.php (modified) (1 diff)
• plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (2 diffs)
• plugins/dcCKEditor/js/ckeditor/contents.css (modified) (1 diff)
• plugins/dcLegacyEditor/css/jsToolBar/jsToolBar.css (modified) (2 diffs)
• plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php (modified) (3 diffs)
• plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js (modified) (2 diffs)

.hgignore

@@ -6 +6 @@
 build-tools/ckeditor/ckbuilder.jar
 syntax: glob
-csp_report.txt
+var

.hgsigs

@@ -1 +1 @@
 266ba234e2a5115e47379030e9439b6abcb11e80 0 iQEcBAABCgAGBQJV1WIcAAoJELwJObfmz3HnHHEH/1+ohmFEzHx5M90oAtQN4pQLsPCZ/fCVG5w6OoD56DOPP3IMaTSxlEzoG3mjWv0gzAb4zJjPErBwRy7keq3rjT5SyDs17aHRmCE91+YuGNBDnQHAD68gVZaQQ+L2d5+EHYdGtxcwiFUyRWEv+U/4NW0UexuJDVqzS6ztUC45D1a2Qt9Q4bbEsywmE5Bl7IP7hjxKlICJNo3fclpCgdryPeB7gatOJz4uw/T6tbJVzvD2ETA/9kp+hg2yFNWBhS0zgK/BKcinqlh2AW4fPDsrOvr7LnIQUt5KwdJmbNA3A8moF2EU9/PiF76tWF5IHtnk9x/bQjCgukZSZ383eUzlY58=
+ee065bfd6458b8fab13c8adf7649f8f988deb8e1 0 iQEzBAABCgAdFiEEl+7zWgi24VqTXSmqvAk5t+bPcecFAlprnkcACgkQvAk5t+bPcefsjQf/XYGUwwbDjOlWLdBRpGrnANElA1I8It6vlFJhMCBxlKm2USHMcQ0soOD4qFBUNioFBffPFLaD9wYHgU9oDfRzyKO09ntu0zO8jxetGrKItJJJqY9RUCKi5lYxvFICVwk3F7u8dU2Z5QxNI4g6rqlidxjzzBh9SprwcHi5kV33yLaShcvGjpU/23CstGRbfDy/rIBlC+xWEb8F8P+xQpPlzv7Ex7PBEAU3l3cdlwZic7gZM8c9rEf4fenH7WmWTAybeaga2RK5N2D6r4NB3+4zfr/AkwB7LCiLvNC+10RwoRHPwIZTe0pIf7AQG6YCXbWboEsbDD5bzJxpuTDjFJTTcA==

.hgtags

@@ -36 +36 @@
 4c17ef251f93345c0d52fa865cc9e2207af9668a 2.11.2
 9000f35951d874b538b936f6b0d26e83b6d616b3 2.12.1
+57c79fd7f152a9d954c85f0b58cfdccd8b1ed8eb 2.13.1

admin/style/default.css

@@ -1791 +1791 @@
       background: #fff;
       border-bottom-color: #fff; }
+    .part-tabs li a:link {
+      transition: unset; }
   .part-tabs li.part-tabs-active a {
     background: #fff;
@@ -3282 +3284 @@
     border-top: none; } }
 /** --------------------------------------------------
+     Plugins
+--------------------------------------------------- */
+/* dcLegacyEditor */
+/* WYSIWYG Document */
+body.wysiwygDoc {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; }
+
+.wysiwygDoc pre, .wysiwygDoc code, .wysiwygDoc kbd, .wysiwygDoc samp {
+  font-family: "Andale Mono", AndaleMono, Consolas, Monaco, "Courier New", monospace; }
+
+/* dcCKEditor */
+.cke textarea.cke_source {
+  font-family: "Andale Mono", AndaleMono, Consolas, Monaco, "Courier New", monospace;
+  font-size: 100%; }
+
+/** --------------------------------------------------
      3rd parties
 --------------------------------------------------- */
@@ -3632 +3650 @@
     padding-left: 6px;
     padding-right: 6px; } }
+/* CodeMirror CSS */
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: "Andale Mono", AndaleMono, Consolas, Monaco, "Courier New", monospace !important; }
+
 /** --------------------------------------------------
     Debug

admin/style/scss/default.scss

@@ -78 +78 @@
 
 /** --------------------------------------------------
+     Plugins
+--------------------------------------------------- */
+@import "partials/editors";
+
+/** --------------------------------------------------
      3rd parties
 --------------------------------------------------- */
 @import "vendor/magnific-popup";
+@import "vendor/codemirror";
 
 /** --------------------------------------------------

admin/style/scss/partials/_content.scss

@@ -30 +30 @@
                     border-bottom-color: #fff;
                }
+      &:link {
+        transition: unset;
+      }
           }
           &.part-tabs-active a {

composer.json

@@ -2 +2 @@
      "name": "dotclear/dotclear",
      "description": "Dotclear is an open-source web publishing software.",
-     "license": "GPL-V2",
+     "license": "GPL-2.0-only",
      "authors": [
           {

inc/prepend.php

@@ -144 +144 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.13.1');
+define('DC_VERSION','2.14-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

plugins/dcCKEditor/_post_config.php

@@ -251 +251 @@
                }
           }
+
      });
 
      CKEDITOR.on('instanceReady',function(e) {
+          if (typeof dotclear_htmlFontSize !== 'undefined') {
+               e.editor.document.$.documentElement.style.setProperty('--html-font-size',dotclear_htmlFontSize);
+          }
 
           if ($('label[for="post_excerpt"] a img').attr('src') == dotclear.img_minus_src) {

plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php

@@ -32 +32 @@
         }
 
-        return
+        $res =
             '<script type="text/javascript">'."\n".
             dcPage::jsVar('dotclear.ckeditor_context', $context).
@@ -58 +58 @@
             dcPage::jsLoad(self::$p_url.'/js/ckeditor/adapters/jquery.js').
             dcPage::jsLoad($config_js);
+
+          if ($GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) {
+               $res .=
+               '<script type="text/javascript">'."\n".
+               dcPage::jsVar('dotclear_htmlFontSize',$GLOBALS['core']->auth->user_prefs->interface->htmlfontsize)."\n".
+               "</script>\n";
+          }
+
+          return $res;
      }
 

plugins/dcCKEditor/js/ckeditor/contents.css

@@ -27 +27 @@
      word-wrap: break-word;
 }
+
+/* Dotclear */
+:root {
+     --html-font-size: 62.5%; }
+
+html {
+     font-size: 62.5%;
+     font-size: var(--html-font-size); }
+
+body {
+     font-size: 1.4rem;
+     line-height: 1.5;
+     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+}
+.cke_editable
+{
+     font-size: 1.4rem;
+}
+/* End Dotclear */
 
 blockquote

plugins/dcLegacyEditor/css/jsToolBar/jsToolBar.css

@@ -168 +168 @@
 /* WYSIWYG Document */
 body.wysiwygDoc {
-     font: 12px "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
      color : #000;
      background: #f9f9f9;
@@ -174 +173 @@
      padding : 2px;
      border: none;
-}
-.wysiwygDoc pre, .wysiwygDoc code, .wysiwygDoc kbd, .wysiwygDoc samp {
-     font-family:"Courier New",Courier,monospace;
-     font-size : 1.1em;
 }
 .wysiwygDoc code {

plugins/dcLegacyEditor/inc/dc.legacy.editor.behaviors.php

@@ -69 +69 @@
           "jsToolBar.prototype.iframe_css = '".
           'body {'.
-          '    font: 12px "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;'.
           '    color: #000;'.
           '    background: #f9f9f9;'.
@@ -76 +75 @@
           '    border: none;'.
           (l10n::getTextDirection($GLOBALS['_lang']) == 'rtl' ? '     direction: rtl;' : '').
-          '}'.
-          'pre, code, kbd, samp {'.
-          '    font-family: "Courier New",Courier,monospace;'.
-          '    font-size: 1.1em;'.
           '}'.
           'code {'.
@@ -140 +135 @@
           "</script>\n";
 
+          if ($GLOBALS['core']->auth->user_prefs->interface->htmlfontsize) {
+               $res .=
+               '<script type="text/javascript">'."\n".
+               dcPage::jsVar('dotclear_htmlFontSize',$GLOBALS['core']->auth->user_prefs->interface->htmlfontsize)."\n".
+               "</script>\n";
+          }
+
           return $res;
      }

plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -165 +165 @@
           '<html>\n'+
           '<head>\n'+
+          '<link rel="stylesheet" href="style/default.css" type="text/css" media="screen" />'
           '<style type="text/css">'+This.iframe_css+'</style>\n'+
           (This.base_url != '' ? '<base href="'+This.base_url+'" />' : '')+
@@ -177 +178 @@
                doc.designMode = 'on';
                // warning : doc is now inaccessible for IE6 sp1
+          }
+
+          if (typeof dotclear_htmlFontSize !== 'undefined') {
+               doc.documentElement.style.setProperty('--html-font-size',dotclear_htmlFontSize);
           }