lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: css optimizing

Browse Source 
Fix: wrong position of link

:link :visited :hover :active
This commit is contained in:
Regis Houssin 2010-04-07 09:21:30 +00:00
parent 6f7f1c7c65
commit 86e27744b9
2 changed files with 38 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/master.inc.php
View File

@ -349,13 +349,14 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
if (is_numeric($conf->global->MAIN_INFO_SOCIETE_PAYS)) if (is_numeric($conf->global->MAIN_INFO_SOCIETE_PAYS))
{ {
$mysoc->pays_id=$conf->global->MAIN_INFO_SOCIETE_PAYS; $mysoc->pays_id=$conf->global->MAIN_INFO_SOCIETE_PAYS;
$sql = "SELECT code from ".MAIN_DB_PREFIX."c_pays"; $sql = "SELECT code, libelle as label from ".MAIN_DB_PREFIX."c_pays";
$sql .= " WHERE rowid = ".$conf->global->MAIN_INFO_SOCIETE_PAYS; $sql .= " WHERE rowid = ".$conf->global->MAIN_INFO_SOCIETE_PAYS;
$result=$db->query($sql); $result=$db->query($sql);
if ($result) if ($result)
{ {
$obj = $db->fetch_object(); $obj = $db->fetch_object();
$mysoc->pays_code=$obj->code; $mysoc->pays_code=$obj->code;
$mysoc->country=$obj->code?($langs->trans('Country'.$obj->code)!='Country'.$obj->code?$langs->trans('Country'.$obj->code):$obj->label):'';
} }
else { else {
dol_print_error($db); dol_print_error($db);
@ -365,6 +366,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
else else
{ {
$mysoc->pays_code=$conf->global->MAIN_INFO_SOCIETE_PAYS; $mysoc->pays_code=$conf->global->MAIN_INFO_SOCIETE_PAYS;
$mysoc->country=$conf->global->MAIN_INFO_SOCIETE_PAYS?$langs->trans('Country'.$conf->global->MAIN_INFO_SOCIETE_PAYS):'';
} }
$mysoc->tel=$conf->global->MAIN_INFO_SOCIETE_TEL; // TODO obsolete $mysoc->tel=$conf->global->MAIN_INFO_SOCIETE_TEL; // TODO obsolete
$mysoc->phone=$conf->global->MAIN_INFO_SOCIETE_TEL; $mysoc->phone=$conf->global->MAIN_INFO_SOCIETE_TEL;

66
htdocs/theme/eldy/eldy.css.php
View File

@ -705,7 +705,7 @@ td.tab {
/* Nouvelle syntaxe a utiliser */ /* Nouvelle syntaxe a utiliser */
a.butAction:link { a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active, a.butActionDelete, a.butActionDelete:link, a.butActionDelete:visited, a.butActionDelete:hover, a.butActionDelete:active {
font-family: helvetica, verdana, arial, sans-serif; font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold; font-weight: bold;
background: white; background: white;
@ -714,40 +714,24 @@ a.butAction:link {
padding: 0em 0.7em; padding: 0em 0.7em;
margin: 0em 0.5em; margin: 0em 0.5em;
text-decoration: none; text-decoration: none;
white-space: nowrap; } white-space: nowrap;
}
a.butAction:visited {
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
background: white;
border: 1px solid #8CACBB;
color: #436976;
padding: 0em 0.7em;
margin: 0em 0.5em;
text-decoration: none;
white-space: nowrap; }
a.butAction:active {
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
background: white;
border: 1px solid #8CACBB;
color: #436976;
padding: 0em 0.7em;
margin: 0em 0.5em;
text-decoration: none;
white-space: nowrap; }
a.butAction:hover { a.butAction:hover {
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
background: #dee7ec; background: #dee7ec;
border: 1px solid #8CACBB; }
color: #436976;
padding: 0em 0.7em; a.butActionDelete {
margin: 0em 0.5em; border: 1px solid red;
text-decoration: none; }
white-space: nowrap; }
a.butActionDelete:link, a.butActionDelete:visited, a.butActionDelete:hover, a.butActionDelete:active {
border: 1px solid #997777;
}
a.butActionDelete:hover {
background: #FFe7ec;
}
.butActionRefused { .butActionRefused {
font-family: helvetica, verdana, arial, sans-serif !important; font-family: helvetica, verdana, arial, sans-serif !important;
@ -760,23 +744,7 @@ a.butAction:hover {
text-decoration: none !important; text-decoration: none !important;
white-space: nowrap !important; white-space: nowrap !important;
cursor: not-allowed; cursor: not-allowed;
} }
a.butActionDelete {
font-family: helvetica, verdana, arial, sans-serif;
font-weight: bold;
background: white;
border: 1px solid red;
color: #436976;
padding: 0em 0.7em;
margin: 0em 0.5em;
text-decoration: none;
white-space: nowrap; }
a.butActionDelete:link { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: white; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
a.butActionDelete:active { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: white; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
a.butActionDelete:visited { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: white; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
a.butActionDelete:hover { font-family: helvetica, verdana, arial, sans-serif; font-weight: bold; background: #FFe7ec; border: 1px solid #997777; color: #436976; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
/* ============================================================================== */ /* ============================================================================== */