From d735f5dc70edc49ec860ba2701ddcaa124be5c33 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 22 Apr 2016 11:09:47 +0200
Subject: [PATCH] FIX lost css change
---
dev/dolibarr_changes.txt | 30 ++++++++++++-------
.../includes/ckeditor/ckeditor/contents.css | 2 +-
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index d666aa02165..a7aed128151 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -10,6 +10,16 @@ Replace "& new" by "new"
+CKEDITOR:
+---------
+* In ckeditor/ckeditor/contents.css
+Replace:
+ margin: 20px;
+With
+ margin: 5px;
+
+
+
NUSOAP:
-------
* In file nusoap.php, to avoid a warning,
@@ -38,6 +48,7 @@ with:
}
+
TCPDF:
------
* To avoid to have QRcode changed because generated with a random mask, replace
@@ -45,13 +56,8 @@ define('QR_FIND_FROM_RANDOM', 2);
with
define('QR_FIND_FROM_RANDOM', false);
-* Removed all fonts except
- dejavusans* (used by greek, arab, persan, romanian, turkish),
- freemono* (russian),
- cid*+msungstdlight+stsongstdlight+uni2cid* (chinese),
- helvetica* (all other languages),
- zapfdingbats.php (for special chars like form checkboxes)
* Removed useless directories (examples, tools)
+
* Fix
// initialize subsetchars
$subsetchars = array();
@@ -59,13 +65,18 @@ into
// initialize subsetchars
$subsetchars = array_fill(0, 256, true);
-* Made freemono the default monotype font because we removed courier
+* Optionnaly, removed all fonts except
+ dejavusans* (used by greek, arab, persan, romanian, turkish),
+ freemono* (russian),
+ cid*+msungstdlight+stsongstdlight+uni2cid* (chinese),
+ helvetica* (all other languages),
+ zapfdingbats.php (for special chars like form checkboxes)
+
+* Optionnaly, made freemono the default monotype font because we removed courier
In htdocs/includes/tcpdf/tcpdf.php
- protected $default_monospaced_font = 'courier';
+ protected $default_monospaced_font = 'freemono';
-* Renamed getmypid into dol_getmypid().
-
TCPDI:
@@ -80,7 +91,6 @@ require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php')
-
JSGANTT:
--------
* Replace in function JSGantt.taskLink
diff --git a/htdocs/includes/ckeditor/ckeditor/contents.css b/htdocs/includes/ckeditor/ckeditor/contents.css
index bef3ebc8b1b..7e990756288 100644
--- a/htdocs/includes/ckeditor/ckeditor/contents.css
+++ b/htdocs/includes/ckeditor/ckeditor/contents.css
@@ -15,7 +15,7 @@ body
/* Remove the background color to make it transparent */
background-color: #fff;
- margin: 20px;
+ margin: 5px;
}
.cke_editable
--
GitLab