From 01b0336e9bfef0038de0ed7eb9741ef492f69296 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Mar 2018 12:10:27 +0100 Subject: [PATCH] Fix tooltip on delete button --- htdocs/langs/en_US/projects.lang | 1 + htdocs/projet/tasks/task.php | 2 +- htdocs/theme/eldy/style.css.php | 15 +++++++-------- htdocs/theme/md/style.css.php | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 5f71b230537..a064d032083 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -100,6 +100,7 @@ ActivityOnProjectThisMonth=Activity on project this month ActivityOnProjectThisYear=Activity on project this year ChildOfProjectTask=Child of project/task ChildOfTask=Child of task +TaskHasChild=Task has child NotOwnerOfProject=Not owner of this private project AffectedTo=Allocated to CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab. diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 85a6461fbfb..b70c09cb2bd 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -586,7 +586,7 @@ if ($id > 0 || ! empty($ref)) } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } else diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c34f867348a..311012c4b04 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3079,15 +3079,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) { overflow: hidden; text-overflow: ellipsis; } -.boxstats { - padding: 3px; - width: 121px; -} .boxstats130 { width: 158px; height: 48px; padding: 3px } +.boxstats { + padding: 3px; + width: 121px; +} .boxstatscontent { padding: 3px; } @@ -3096,9 +3096,8 @@ ul.noborder li:nth-child(even):not(.liste_titre) { { .boxstats, .boxstats130 { margin: 3px; - border: 1px solid #ddd; - box-shadow: none; - background: #ddd; + border: 1px solid #ccc; + box-shadow: 1px 1px 5px #bbb; } .boxstats130 { text-align: @@ -3117,7 +3116,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) { width: 148px; } .boxstats { - width: 100px; + width: 111px; } } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index de12d09b121..94dc4235641 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1208,7 +1208,7 @@ div.fiche { div.fiche { margin-: dol_optimize_smallscreen)?'24':'6')); ?>px; - margin-: dol_optimize_smallscreen)?'16':'6')); ?>px; + margin-: dol_optimize_smallscreen)?'22':'6')); ?>px; dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> margin-bottom: 15px; } @@ -2739,7 +2739,7 @@ div.pagination li span:focus { color: #000; background-color: #eee; border-color: #ddd; - padding-top: 8px; + /* padding-top: 8px; */ } div.pagination li .active a, div.pagination li .active span,