From 427f1490f896e22d6b0f11518cc7558e69f45e19 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 Dec 2017 13:52:32 +0100 Subject: [PATCH] Fix css --- htdocs/core/lib/usergroups.lib.php | 54 +++++++++++++++--------------- htdocs/theme/eldy/style.css.php | 6 ++-- htdocs/theme/md/style.css.php | 6 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index c90bc11675c..6fe236d6b41 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -599,6 +599,33 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; } + // TextTitleColor + if ($foruserprofile) + { + + + } + else + { + print ''; + print ''.$langs->trans("TextTitleColor").''; + print ''; + if ($edit) + { + print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' '; + } + else + { + print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default")); + } + print '   ('.$langs->trans("Default").': 643c14) '; + print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); + + print ''; + + print ''; + } + // BackgroundTableTitleColor if ($foruserprofile) { @@ -681,33 +708,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print ''; } - // TextTitleColor - if ($foruserprofile) - { - - - } - else - { - print ''; - print ''.$langs->trans("TextTitleColor").''; - print ''; - if ($edit) - { - print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB,array()),''),'THEME_ELDY_TEXTTITLENOTAB','formcolor',1).' '; - } - else - { - print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default")); - } - print '   ('.$langs->trans("Default").': 643c14) '; - print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); - - print ''; - - print ''; - } - // Text LinkColor if ($foruserprofile) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 370b34bf4ae..d2fce0bd362 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2484,10 +2484,10 @@ table.liste tr, table.noborder tr, div.noborder form { min-height: 20px; } table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.noborder tr.box_titre td { - padding: 7px 2px 7px 3px; /* t r b l */ + padding: 7px 8px 7px 8px; /* t r b l */ } table.liste td, table.noborder td, div.noborder form div { - padding: 7px 2px 7px 3px; /* t r b l */ + padding: 7px 8px 7px 8px; /* t r b l */ line-height: 1.2em; } div.liste_titre_bydiv .divsearchfield { @@ -2943,7 +2943,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) { } .boxstats { padding: 3px; - width: 103px; + width: 104px; } .boxstats130 { width: 158px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index f62048bdb5c..d6833d7e444 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2538,14 +2538,14 @@ tr.liste_titre_filter td.liste_titre { } table.liste th, table.noborder th, table.noborder tr.liste_titre td { - padding: 8px 2px 8px 3px; /* t r b l */ + padding: 8px 6px 8px 6px; /* t r b l */ } table.noborder td, div.noborder form, div.noborder form div { - padding: 4px 2px 4px 3px; /* t r b l */ + padding: 4px 6px 4px 6px; /* t r b l */ } table.liste td, table.noborder td, div.noborder form div { - padding: 8px 2px 8px 3px; /* t r b l */ + padding: 8px 6px 8px 6px; /* t r b l */ } div.liste_titre_bydiv .divsearchfield { padding: 2px 1px 2px 0px; /* t r b l */