Skip to content
Snippets Groups Projects
Commit be2943ab authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Retour arriere sur modif style car ne fonctionnait plus sur IE6 en resolution variable

parent 0e7cde4d
No related branches found
No related tags found
No related merge requests found
...@@ -549,7 +549,7 @@ function top_htmlhead($head, $title='', $disablejs=0) ...@@ -549,7 +549,7 @@ function top_htmlhead($head, $title='', $disablejs=0)
// Affiche meta // Affiche meta
print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots print '<meta name="robots" content="noindex,nofollow">'."\n"; // Evite indexation par robots
print '<meta name="author" content="DevelopmentTeam">'."\n"; print '<meta name="author" content="Dolibarr Development Team">'."\n";
// Affiche title // Affiche title
if ($title) if ($title)
...@@ -583,7 +583,7 @@ function top_htmlhead($head, $title='', $disablejs=0) ...@@ -583,7 +583,7 @@ function top_htmlhead($head, $title='', $disablejs=0)
print '<link rel="top" title="'.$langs->trans("Home").'" href="'.DOL_URL_ROOT.'/">'."\n"; print '<link rel="top" title="'.$langs->trans("Home").'" href="'.DOL_URL_ROOT.'/">'."\n";
print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n"; print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
print '<link rel="author" title="'.$langs->trans("DevelopmentTeam").'" href="http://www.dolibarr.org">'."\n"; print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
if (! $disablejs && ($conf->use_javascript || $conf->use_ajax)) if (! $disablejs && ($conf->use_javascript || $conf->use_ajax))
{ {
...@@ -786,6 +786,17 @@ function left_menu($menu_array, $help_url='', $form_search='') ...@@ -786,6 +786,17 @@ function left_menu($menu_array, $help_url='', $form_search='')
print "\n"; print "\n";
print "</div>\n"; print "</div>\n";
print "<!-- Fin left vertical menu -->\n"; print "<!-- Fin left vertical menu -->\n";
// Cas special pour auguria.
// On le met pour tous les autres styles sinon ko avec IE6 et resolution autre que 1024x768
if ($conf->theme != 'auguria')
{
print "\n";
print '</div>'."\n";
print '<!-- fin de zone gauche, debut zon droite -->';
print '<div class="vmenuplusfiche">'."\n";
print "\n";
}
print '<!-- fiche -->'."\n"; print '<!-- fiche -->'."\n";
print '<div class="fiche">'."\n"; print '<div class="fiche">'."\n";
......
...@@ -105,6 +105,15 @@ select.flat ...@@ -105,6 +105,15 @@ select.flat
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
.button:focus {
font: 12px helvetica, verdana, arial, sans-serif;
color: #222244;
border: 0px;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/button_bg.png' ?>);
background-position: bottom;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
}
form form
{ {
padding: 0em 0em 0em 0em; padding: 0em 0em 0em 0em;
...@@ -1357,4 +1366,5 @@ div.menuFleche ...@@ -1357,4 +1366,5 @@ div.menuFleche
width:30px; width:30px;
position:relative; position:relative;
} }
\ No newline at end of file
...@@ -49,7 +49,9 @@ body { ...@@ -49,7 +49,9 @@ body {
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/freelug/img/background.png' ?>); background-image: url(<?php echo $dolibarr_main_url_root.'/theme/freelug/img/background.png' ?>);
text-decoration: none ; text-decoration: none ;
color: #101010; color: #101010;
font: 12px helvetica, verdana, arial, sans-serif; font-size: 12px;
font-family: helvetica, verdana, arial, sans-serif;
} }
a:link { font: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } a:link { font: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; }
...@@ -61,31 +63,31 @@ input ...@@ -61,31 +63,31 @@ input
font: 12px helvetica, verdana, arial, sans-serif; font: 12px helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
padding: 0em 0em; padding: 0px 0px 0px 0px;
margin: 0em 0em 0em 0em; margin: 0px 0px 0px 0px;
} }
input.flat input.flat
{ {
font: 12px helvetica, verdana, arial, sans-serif; font: 12px helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
padding: 0em 0em; padding: 0px 0px 0px 0px;
margin: 0em 0em 0em 0em; margin: 0px 0px 0px 0px;
} }
textarea { textarea {
font: 12px helvetica, verdana, arial, sans-serif; font: 12px helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
padding: 0em 0em; padding: 0px 0px 0px 0px;
margin: 0em 0em 0em 0em; margin: 0px 0px 0px 0px;
} }
textarea.flat textarea.flat
{ {
font: 12px helvetica, verdana, arial, sans-serif; font: 12px helvetica, verdana, arial, sans-serif;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #8C9C9B; border: 1px solid #8C9C9B;
padding: 0em 0em; padding: 0px 0px 0px 0px;
margin: 0em 0em 0em 0em; margin: 0px 0px 0px 0px;
} }
select.flat select.flat
{ {
...@@ -106,22 +108,11 @@ select.flat ...@@ -106,22 +108,11 @@ select.flat
background-position: bottom; background-position: bottom;
background-repeat: repeat-x; background-repeat: repeat-x;
} }
.button:focus {
font: 11px arial,verdana,heletica, sans-serif;
padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
border-left: 1px solid #aaaaaa;
border-right: 1px solid #cccccc;
border-top: 1px solid #aaaaaa;
border-bottom: 1px solid #ffffff;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/freelug/img/button_bg.xxx' ?>);
background-position: bottom;
background-repeat: repeat-x;
}
form form
{ {
padding: 0em 0em 0em 0em; padding: 0px 0px 0px 0px;
margin: 0em 0em 0em 0em; margin: 0px 0px 0px 0px;
} }
...@@ -153,7 +144,7 @@ div.vmenu ...@@ -153,7 +144,7 @@ div.vmenu
div.fiche div.fiche
{ {
float: right top; float: right top;
<?php <?php
//print "_SERVER['HTTP_USER_AGENT']=".$_SERVER['HTTP_USER_AGENT']; //print "_SERVER['HTTP_USER_AGENT']=".$_SERVER['HTTP_USER_AGENT'];
if (! eregi('MSIE 7\.0',$_SERVER['HTTP_USER_AGENT'])) print " position: absolute;\n"; if (! eregi('MSIE 7\.0',$_SERVER['HTTP_USER_AGENT'])) print " position: absolute;\n";
...@@ -602,17 +593,6 @@ a.leftmenu { ...@@ -602,17 +593,6 @@ a.leftmenu {
div.leftmenu {
background: #ccccb3;
text-align: left;
border-right: 1px solid #000000;
border-bottom: 1px solid #000000;
margin: 1px 0em 0em 0em;
padding: 2px;
}
/* /*
* Ok, Warning, Error * Ok, Warning, Error
*/ */
...@@ -906,6 +886,7 @@ color:#062342; ...@@ -906,6 +886,7 @@ color:#062342;
vertical-align:middle; vertical-align:middle;
cursor: pointer; cursor: pointer;
} }
/* ============================================================================== */ /* ============================================================================== */
/* Afficher/cacher */ /* Afficher/cacher */
/* ============================================================================== */ /* ============================================================================== */
...@@ -929,4 +910,4 @@ td.hidden { ...@@ -929,4 +910,4 @@ td.hidden {
// Utilise dans smarty uniquement. A virer // Utilise dans smarty uniquement. A virer
td.alerte { td.alerte {
background: #FF99A9; background: #FF99A9;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment