lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-21 23:19:18 +02:00
commit 8f18db8e3f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/ckeditor/contents.css
View File

@ -15,7 +15,7 @@ body
/* Remove the background color to make it transparent */
background-color: #fff;
margin: 20px;
margin: 8px;
}
.cke_editable

8
htdocs/theme/eldy/style.css.php
View File

@ -242,6 +242,10 @@ a:hover { text-decoration: underline; color: #000000;}
input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF;
}
textarea.cke_source:focus
{
box-shadow: none;
}
input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: <?php print $fontsize ?>px;
@ -2493,6 +2497,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
/* CKEditor */
/* ============================================================================== */
.cke_editable
{
margin: 5px !important;
}
.cke_editor table, .cke_editor tr, .cke_editor td
{
border: 0px solid #FF0000 !important;