diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 9f58a61aaa6..27590366e6f 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -194,16 +194,16 @@ class FormActions $projectid = $object->fk_project; if ($typeelement == 'project') $projectid = $object->id; - $buttontoaddnewevent=''; + $newcardbutton=''; if (! empty($conf->agenda->enabled)) { - $buttontoaddnewevent = ''; - $buttontoaddnewevent.= $langs->trans("AddEvent"); - $buttontoaddnewevent.= ''; + $newcardbutton = ''; + $newcardbutton.= $langs->trans("AddEvent"); + $newcardbutton.= ''; } print ''."\n"; - print load_fiche_titre($title, $buttontoaddnewevent, '', 0, 0, '', $morehtmlright); + print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlright); $page=0; $param=''; diff --git a/htdocs/theme/eldy/img/statut3.png b/htdocs/theme/eldy/img/statut3.png index 158c640bb60..77476349d6d 100644 Binary files a/htdocs/theme/eldy/img/statut3.png and b/htdocs/theme/eldy/img/statut3.png differ diff --git a/htdocs/theme/eldy/img/statut3_40x40.png b/htdocs/theme/eldy/img/statut3_40x40.png index f71ef4eb962..48314ccb183 100644 Binary files a/htdocs/theme/eldy/img/statut3_40x40.png and b/htdocs/theme/eldy/img/statut3_40x40.png differ diff --git a/htdocs/theme/eldy/img/statut4.png b/htdocs/theme/eldy/img/statut4.png index d0df7e40aef..616f10de496 100644 Binary files a/htdocs/theme/eldy/img/statut4.png and b/htdocs/theme/eldy/img/statut4.png differ diff --git a/htdocs/theme/eldy/img/statut4_40x40.png b/htdocs/theme/eldy/img/statut4_40x40.png index 2da24b66484..879f48739f6 100644 Binary files a/htdocs/theme/eldy/img/statut4_40x40.png and b/htdocs/theme/eldy/img/statut4_40x40.png differ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 689ba9bb3bd..47406666583 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2303,7 +2303,7 @@ a.tabunactive { } a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; - padding: 12px 9px 12px; + padding: 12px 9px 13px; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; @@ -2378,20 +2378,21 @@ span.butAction, span.butActionDelete { cursor: pointer; } -.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { +.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { text-decoration: none; margin: 0em em !important; padding: 0.6em em; font-family: ; font-weight: normal; - 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; text-align: center; cursor: pointer; - color: #fff; - background: rgb(); - border: 1px solid rgb(); + /* color: #fff; */ + /* background: rgb(); */ + color: #000; + text-transform: uppercase; + border: 1px solid #aaa; border-top-right-radius: 0 !important; border-bottom-right-radius: 0 !important; @@ -2418,6 +2419,7 @@ span.butAction, span.butActionDelete { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; } +a.butActionNew>span.fa-plus-circle { padding-left: 6px; } .butAction:hover, .butActionNew:hover { -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); @@ -2425,9 +2427,9 @@ span.butAction, span.butActionDelete { } .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete { - background: #633; - border: 1px solid #633; - color: #FFF; + /* background: #633; */ + border: 1px solid #733; + color: #733; } .butActionDelete:hover { diff --git a/htdocs/theme/md/img/statut3.png b/htdocs/theme/md/img/statut3.png index 158c640bb60..77476349d6d 100644 Binary files a/htdocs/theme/md/img/statut3.png and b/htdocs/theme/md/img/statut3.png differ diff --git a/htdocs/theme/md/img/statut3_40x40.png b/htdocs/theme/md/img/statut3_40x40.png index f71ef4eb962..48314ccb183 100644 Binary files a/htdocs/theme/md/img/statut3_40x40.png and b/htdocs/theme/md/img/statut3_40x40.png differ diff --git a/htdocs/theme/md/img/statut4.png b/htdocs/theme/md/img/statut4.png index d0df7e40aef..616f10de496 100644 Binary files a/htdocs/theme/md/img/statut4.png and b/htdocs/theme/md/img/statut4.png differ diff --git a/htdocs/theme/md/img/statut4_40x40.png b/htdocs/theme/md/img/statut4_40x40.png index 2da24b66484..879f48739f6 100644 Binary files a/htdocs/theme/md/img/statut4_40x40.png and b/htdocs/theme/md/img/statut4_40x40.png differ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 56329f5d9a5..b1c42b234de 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1363,7 +1363,7 @@ table.noborder tr.liste_titre td { .fiche .arearef img.pictoedit, .fiche .arearef span.pictoedit, .fiche .fichecenter img.pictoedit, .fiche .fichecenter span.pictoedit, .tagtdnote span.pictoedit { - opacity: 0.9; + opacity: 0.6; } img.hideonsmartphone.pictoactionview { vertical-align: bottom; @@ -2401,6 +2401,7 @@ span.butAction, span.butActionDelete { background-image: linear-gradient(to bottom, #0088cc, #0044cc); background-repeat: repeat-x; } +a.butActionNew>span.fa { padding-right: 6px; } .button, .butAction { color: #ffffff !important; @@ -2535,15 +2536,16 @@ table.border, table.bordernooddeven, table.dataTable, .table-border, .table-bord table.borderplus { border: 1px solid #BBB; } + .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col { - height: 22px; + height: 26px; } tr.liste_titre.box_titre td table td, .bordernooddeven tr td { - height: 22px; + height: 26px; } -table.border td, div.border div div.tagtd { - padding: 2px 2px 2px 2px; +table.border td, table.bordernooddeven td, div.border div div.tagtd { + padding: 2px 4px 2px 4px; border: 1px solid #f0f0f0; border-collapse: collapse; } diff --git a/htdocs/ticketsup/list.php b/htdocs/ticketsup/list.php index 1c5f58d7931..583fe0e3189 100644 --- a/htdocs/ticketsup/list.php +++ b/htdocs/ticketsup/list.php @@ -451,7 +451,7 @@ if ($projectid) print '' . $langs->trans('NewTicket') . ''; + $newcardbutton = '' . $langs->trans('NewTicket') . ''; } print_barre_liste($langs->trans('TicketList'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_ticketsup', 0, $newcardbutton, '', $limit); diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index a1ece93d71d..c0d4373d6d4 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -60,8 +60,9 @@ llxHeader('', $title); $newcardbutton=''; if ($user->rights->produit->creer) { - $newcardbutton=''.$langs->trans('Create').''; + $newcardbutton=''.$langs->trans('Create').''; } + print load_fiche_titre($title, $newcardbutton, 'title_products'); $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;