From b407797ca3d119fb70f361522006ad93741bebe3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Mar 2020 17:45:45 +0200 Subject: [PATCH] Fix css --- htdocs/bom/tpl/objectline_view.tpl.php | 4 ++-- htdocs/cashdesk/index.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 4 ++-- htdocs/expedition/card.php | 2 +- htdocs/reception/card.php | 6 +++--- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/theme/md/style.css.php | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php index ad2c2d3e4c6..1419136a2e8 100644 --- a/htdocs/bom/tpl/objectline_view.tpl.php +++ b/htdocs/bom/tpl/objectline_view.tpl.php @@ -113,7 +113,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' ) $coldisplay++; if (($line->info_bits & 2) == 2 || ! empty($disableedit)) { } else { - print 'id.'#line_'.$line->id.'">'.img_edit().''; + print 'id.'#line_'.$line->id.'">'.img_edit().''; } print ''; @@ -121,7 +121,7 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' ) $coldisplay++; if (($line->fk_prev_id == null) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation - print 'id.'">'; + print 'id.'">'; print img_delete(); print ''; } diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index fcfe9905bae..2d7d169395a 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -191,7 +191,7 @@ print "\n";
-
+
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index ee1d85e3b54..d61810c5178 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -311,7 +311,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') { $coldisplay++; if (($line->info_bits & 2) == 2 || !empty($disableedit)) { } else { ?> - id.'#line_'.$line->id; ?>"> + id.'#line_'.$line->id; ?>"> '; } print ''; @@ -319,7 +319,7 @@ if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') { print ''; $coldisplay++; if (($line->fk_prev_id == null) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation - print 'id.'">'; + print 'id.'">'; print img_delete(); print ''; } diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 3c739f7dbd7..3632cbfd52e 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2436,7 +2436,7 @@ elseif ($id || $ref) { // edit-delete buttons print ''; - print 'id . '">' . img_edit() . ''; + print 'id . '">' . img_edit() . ''; print ''; print ''; print 'id . '">' . img_delete() . ''; diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index 03dc37db114..0bc3839a23d 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1962,14 +1962,14 @@ elseif ($id || $ref) print '
'; print '
'; } - elseif ($object->statut == 0) + elseif ($object->statut == Reception::STATUS_DRAFT) { // edit-delete buttons print ''; - print 'id.'">'.img_edit().''; + print 'id.'">'.img_edit().''; print ''; print ''; - print 'id.'">'.img_delete().''; + print 'id.'">'.img_delete().''; print ''; // Display lines extrafields diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 35a9234cecc..b0644ad3ff1 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -405,7 +405,7 @@ div#moretabsList, div#moretabsListaction { hr { border: 0; border-top: 1px solid #ccc; } .tabBar hr { margin-top: 20px; margin-bottom: 17px; } -.button, .buttonDelete, input[name="sbmtConnexion"] { +.button:not(.bordertransp), .buttonDelete:not(.bordertransp) { margin-bottom: 0; margin-top: 0; margin-left: 5px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 8f03e70f460..7b3216e9cf5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -530,7 +530,7 @@ div#moretabsList, div#moretabsListaction { hr { border: 0; border-top: 1px solid #ccc; } -.button, .buttonDelete, input[name="sbmtConnexion"] { +.button:not(.bordertransp), .buttonDelete:not(.bordertransp) { border-color: #c5c5c5; border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); display: inline-block;