diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 5c4368d4bc0..35f173fc572 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -42,15 +42,15 @@ $userstatic=new User($db); trans("ContactType"); ?>   - + - +
" /> - + > trans("Users"); ?> global->MAIN_INFO_SOCIETE_NOM; ?> @@ -59,7 +59,7 @@ $userstatic=new User($db); ">
- +
" /> @@ -67,12 +67,12 @@ $userstatic=new User($db); - + > trans("ThirdPartyContacts"); ?> use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT) { ?> - 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled')); print $form->select_company($object->socid,'socid','',1,0,0,$events); @@ -98,10 +98,7 @@ $userstatic=new User($db);
- - -   - + @@ -114,17 +111,17 @@ $userstatic=new User($db); - + liste_contact(-1,$source); $num=count($tab); - + $i = 0; while ($i < $num) { $var = !$var; ?> - + valign="top"> trans("User"); ?> @@ -148,7 +145,7 @@ $userstatic=new User($db); ?> - id=$tab[$i]['id']; @@ -177,9 +174,9 @@ $userstatic=new User($db); - + - + \ No newline at end of file diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index cfb84a31b0e..0ddc1d05323 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1067,7 +1067,7 @@ background-image: -ms-linear-gradient(bottom, rgb() 15 div.tabs { top: 20px; - margin: 1px 0px 0px 0px; + margin: 1px 0px 2px 0px; padding: 0px 6px 0px 0px; text-align: ; } @@ -1086,7 +1086,6 @@ div.tabBar { border-bottom: 1px solid #CCCCCC; border-left: 1px solid #D0D0D0; border-top: 1px solid #D8D8D8; -/* background: #dee7ec url() repeat-x; */ /* DYN */ background-image: linear-gradient(bottom, rgb() 25%, rgb() 100%); @@ -1112,16 +1111,15 @@ a.tabTitle { color: white; font-family: ; font-weight: normal; - padding: 0px 6px; + padding: 0px 6px 2px 6px; margin: 0px 6px; text-decoration: none; white-space: nowrap; } -a.tab:link { - background: #dee7ec; +a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; - padding: 0px 6px; + padding: 2px 6px 2px 6px; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; @@ -1133,85 +1131,20 @@ a.tab:link { border-: 1px solid #D8D8D8; border-top: 1px solid #D8D8D8; -/* DYN */ -background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); - + /* DYN */ + background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); } -a.tab:visited { - background: #dee7ec; - font-family: ; - padding: 0px 6px; - margin: 0em 0.2em; - text-decoration: none; - white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; - border-: 1px solid #555555; - border-: 1px solid #D8D8D8; - border-top: 1px solid #D8D8D8; - -/* DYN */ -background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); - -} a.tab#active { - background: white; - font-family: ; - padding: 0px 6px; - margin: 0em 0.2em; - text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; - - border-: 1px solid #555555; - border-: 1px solid #D8D8D8; - border-top: 1px solid #D8D8D8; -/* border-bottom: 1px solid white; */ - -/* DYN */ -/*background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); -*/ - border-bottom: 1px solid rgb(); - background-color: rgb(); + border-bottom: 1px solid rgb() !important; + background-color: rgb() !important; + background-image: none !important; } -a.tab:hover { - background: white; - font-family: ; - padding: 0px 6px; - margin: 0em 0.2em; - text-decoration: none; - -moz-border-radius:6px 6px 0px 0px; - -webkit-border-radius:6px 6px 0px 0px; - border-radius:6px 6px 0px 0px; - - border-: 1px solid #555555; - border-: 1px solid #D8D8D8; - border-top: 1px solid #D8D8D8; - -/* DYN */ -background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); -background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); -} - -a.tab:link, a.tab:visited, a.tab#active, a.tab:hover +a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { color: #; } @@ -1311,9 +1244,9 @@ span.butAction, span.butActionDelete { } #undertopmenu { -/* background-image: url(""); */ + /* background-image: url(""); */ background-repeat: repeat-x; - margin-top: 8px; + margin-top: 12px; }