2
0
forked from Wavyzz/dolibarr

Fix: Pb in css

This commit is contained in:
Laurent Destailleur
2013-06-19 15:52:06 +02:00
parent dcaaa84ddb
commit 51d40b94cc
7 changed files with 58 additions and 35 deletions

View File

@@ -112,14 +112,14 @@ else $searchform=$hookmanager->resPrint;
print "\n"; print "\n";
print "<!-- Begin SearchForm -->\n"; print "<!-- Begin SearchForm -->\n";
print '<div class="center" data-role="page" style="padding-left: 2px;">'; print '<div class="center" data-role="page" align="center"><div align="center" style="padding: 6px;">';
print '<style>.menu_titre { padding-top: 6px; }</style>'; print '<style>.menu_titre { padding-top: 7px; }</style>';
//print '<div id="distance"></div><div id="container" class="center">'; //print '<div id="distance"></div><div id="container" class="center">';
print '<div id="blockvmenusearch">'."\n"; print '<div id="blockvmenusearch">'."\n";
print $searchform; print $searchform;
print '</div>'."\n"; print '</div>'."\n";
//print '</div></div>'; //print '</div></div>';
print '</div>'; print '</div></div>';
print "<!-- End SearchForm -->\n"; print "<!-- End SearchForm -->\n";
print '</div>'; print '</div>';

File diff suppressed because one or more lines are too long

View File

@@ -196,7 +196,9 @@ body {
background-color: <?php print $colorbackbody; ?>; background-color: <?php print $colorbackbody; ?>;
<?php } ?> <?php } ?>
color:#232323; color:#232323;
<?php if (empty($dol_use_jmobile)) { ?>
font-size:<?php print $fontsize ?>px; font-size:<?php print $fontsize ?>px;
<?php } ?>
font-family:<?php print $fontlist ?>; font-family:<?php print $fontlist ?>;
<?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?> <?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?>
} }
@@ -212,6 +214,8 @@ a:hover, a:active {
color:rgba(0,0,0,.6); color:rgba(0,0,0,.6);
} }
<?php if (empty($dol_use_jmobile)) { ?>
input, input.flat, textarea, textarea.flat, form.flat select, select.flat { input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
padding: 1px; padding: 1px;
} }
@@ -225,6 +229,8 @@ input, textarea {
box-shadow:1px 1px 2px rgba(0,0,0,.2) inset; box-shadow:1px 1px 2px rgba(0,0,0,.2) inset;
} }
<?php } ?>
input[type="image"] { input[type="image"] {
border-radius:0px; border-radius:0px;
border:none; border:none;
@@ -2091,7 +2097,7 @@ a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text
} }
.ui-body-c { .ui-body-c {
border: none; border: 1px solid #CCC;
text-shadow: none; text-shadow: none;
} }
.ui-link { .ui-link {

View File

@@ -102,7 +102,9 @@ body {
background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat; background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@@ -113,6 +115,8 @@ body {
a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; } a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000000; text-decoration: none; }
<?php if (empty($dol_use_jmobile)) { ?>
input:focus, textarea:focus, button:focus, select:focus { input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF; box-shadow: 0 0 4px #8091BF;
} }
@@ -125,6 +129,9 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
padding: 1px 1px 1px 1px; padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
<?php } ?>
select.flat, form.flat select { select.flat, form.flat select {
font-weight: normal; font-weight: normal;
} }
@@ -2230,7 +2237,7 @@ a.tab span.ui-btn-inner
} }
.ui-body-c { .ui-body-c {
border: none; border: 1px solid #CCC;
text-shadow: none; text-shadow: none;
} }
.ui-link { .ui-link {

View File

@@ -57,7 +57,7 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
$fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12'; $fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12';
$fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11'; $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11';
$fontlist='arial,tahoma,verdana,helvetica'; $fontlist='arial, sans-serif, verdana, helvetica';
//$fontlist='Verdana,Helvetica,Arial,sans-serif'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
$dol_hide_topmenu=$conf->dol_hide_topmenu; $dol_hide_topmenu=$conf->dol_hide_topmenu;
@@ -79,8 +79,10 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
body { body {
/* background-color: #FFFFFF; */ /* background-color: #FFFFFF; */
color: #101010; color: #101010;
font-size: 12px; <?php if (empty($dol_use_jmobile)) { ?>
font-family: arial, sans-serif, verdana, helvetica; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
margin-right: 0; margin-right: 0;
@@ -2411,7 +2413,7 @@ a.tab span.ui-btn-inner
} }
.ui-body-c { .ui-body-c {
border: none; border: 1px solid #CCC;
text-shadow: none; text-shadow: none;
} }
.ui-link { .ui-link {

View File

@@ -83,7 +83,9 @@ body {
/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/ /*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@@ -96,6 +98,8 @@ body {
a:link, a:visited, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: blue; text-decoration: none; } a:link, a:visited, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: blue; text-decoration: none; }
a:hover { font-family: <?php print $fontlist ?>; font-weight: bold; color: #A51B00; text-decoration: none; } a:hover { font-family: <?php print $fontlist ?>; font-weight: bold; color: #A51B00; text-decoration: none; }
<?php if (empty($dol_use_jmobile)) { ?>
input:focus, textarea:focus, button:focus, select:focus { input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF; box-shadow: 0 0 4px #8091BF;
} }
@@ -108,6 +112,8 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
padding: 1px 1px 1px 1px; padding: 1px 1px 1px 1px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
} }
<?php } ?>
select.flat, form.flat select { select.flat, form.flat select {
font-weight: normal; font-weight: normal;
} }
@@ -117,6 +123,7 @@ input:disabled {
textarea:disabled { textarea:disabled {
background:#ddd; background:#ddd;
} }
input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
input[type=image] { background-color: transparent; border: none; box-shadow: none; } input[type=image] { background-color: transparent; border: none; box-shadow: none; }
input.button[type=submit] { input.button[type=submit] {
@@ -135,7 +142,7 @@ input.button[type=submit] {
/*display: block; /*display: block;
height: 18px;*/ height: 18px;*/
vertical-align: top; vertical-align: top;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
line-height: 14px; line-height: 14px;
cursor: pointer; cursor: pointer;
font-size: 11px; font-size: 11px;
@@ -354,7 +361,7 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
/*margin: 0px 1px 0px 1px;*/ /*margin: 0px 1px 0px 1px;*/
font-weight: bold; font-weight: bold;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
white-space: nowrap; white-space: nowrap;
height: 20px; height: 20px;
-moz-border-radius-topleft:8px; -moz-border-radius-topleft:8px;
@@ -394,7 +401,7 @@ a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
color: #FFF; color: #FFF;
font-weight: bold; font-weight: bold;
height: 20px; height: 20px;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
-moz-border-radius-topleft:8px; -moz-border-radius-topleft:8px;
-moz-border-radius-topright:8px; -moz-border-radius-topright:8px;
@@ -775,7 +782,7 @@ div.menu_titre
div.menu_titre a.vmenu { div.menu_titre a.vmenu {
font-weight: bold; font-weight: bold;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
font-size: 12px; font-size: 12px;
} }
@@ -1154,7 +1161,7 @@ div.tabs a.tab {
width: auto; width: auto;
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
height: 18px; height: 18px;
background-position: right; background-position: right;
line-height: 18px; line-height: 18px;
@@ -1263,7 +1270,7 @@ span.tabspan {
div.divButAction { margin-bottom: 1.4em; } div.divButAction { margin-bottom: 1.4em; }
.butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionRefused, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionRefused, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
font-family:"Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
font-weight: bold; font-weight: bold;
/*background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/bg_btnBlue.jpg',1); ?>) repeat-x;*/ /*background: url(<?php echo dol_buildpath($path.'/theme/bureau2crea/img/bg_btnBlue.jpg',1); ?>) repeat-x;*/
background: #A81E00; background: #A81E00;
@@ -1460,7 +1467,7 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel
div.liste_titre, tr.liste_titre, form.liste_titre { div.liste_titre, tr.liste_titre, form.liste_titre {
color: #842F00; color: #842F00;
font-weight: bold; font-weight: bold;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
/*border-bottom: 1px solid #FDFFFF;*/ /*border-bottom: 1px solid #FDFFFF;*/
border-radius: 8px; border-radius: 8px;
padding-left: 10px; padding-left: 10px;
@@ -1548,7 +1555,7 @@ tr.box_titre {
background-repeat: repeat-x; background-repeat: repeat-x;
color: #842F00; color: #842F00;
font-weight: normal; font-weight: normal;
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-topleft:6px; -moz-border-radius-topleft:6px;
-moz-border-radius-topright:6px; -moz-border-radius-topright:6px;
@@ -1660,12 +1667,14 @@ border: 0px;
} }
div.titre { div.titre {
font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; font-family: <?php print $fontlist ?>;
font-weight: normal; font-weight: normal;
color: #842F00; color: #842F00;
font-size: 20px; font-size: 20px;
text-decoration: none; text-decoration: none;
margin-left: 20px; <?php if (empty($dol_use_jmobile)) { ?>
margin-left: 12px;
<?php } ?>
} }
#dolpaymenttable { width: 600px; font-size: 13px; } #dolpaymenttable { width: 600px; font-size: 13px; }
@@ -1975,7 +1984,7 @@ li.cal_event { border: none; list-style-type: none; }
{ {
background:#F0F0F0; background:#F0F0F0;
font-weight:normal; font-weight:normal;
font-family:sans-serif; font-family: <?php print $fontlist ?>;
border-style:ridge; border-style:ridge;
border: 1px solid; border: 1px solid;
border-spacing: 0px; border-spacing: 0px;
@@ -2328,7 +2337,7 @@ a.tab span.ui-btn-inner
} }
.ui-body-c { .ui-body-c {
border: none; border: 1px solid #CCC;
text-shadow: none; text-shadow: none;
} }
.ui-link { .ui-link {

View File

@@ -216,8 +216,10 @@ body {
background: <?php print $colorbackbody; ?>; background: <?php print $colorbackbody; ?>;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile)) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>; <?php } ?>
font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
margin-right: 0; margin-right: 0;
@@ -229,9 +231,12 @@ a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; fo
a:hover { text-decoration: underline; color: #000000;} a:hover { text-decoration: underline; color: #000000;}
<?php if (empty($dol_use_jmobile)) { ?>
input:focus, textarea:focus, button:focus, select:focus { input:focus, textarea:focus, button:focus, select:focus {
box-shadow: 0 0 4px #8091BF; box-shadow: 0 0 4px #8091BF;
} }
input, input.flat, textarea, textarea.flat, form.flat select, select.flat { input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
@@ -242,6 +247,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select.flat {
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
<?php } ?> <?php } ?>
} }
input, textarea, select { input, textarea, select {
border-radius:4px; border-radius:4px;
border:solid 1px rgba(0,0,0,.3); border:solid 1px rgba(0,0,0,.3);
@@ -253,6 +259,8 @@ input, textarea, select {
margin-bottom:1px; margin-bottom:1px;
margin-top:1px; margin-top:1px;
} }
<?php } ?>
select.flat, form.flat select { select.flat, form.flat select {
font-weight: normal; font-weight: normal;
} }
@@ -280,6 +288,7 @@ input[type=image] { background-color: transparent; border: none; box-shadow: non
legend { margin-bottom: 8px; } legend { margin-bottom: 8px; }
<?php } ?> <?php } ?>
.button { .button {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
background-image: url(<?php echo $img_button ?>); background-image: url(<?php echo $img_button ?>);
@@ -2647,7 +2656,7 @@ a.tab span.ui-btn-inner
} }
.ui-body-c { .ui-body-c {
border: none; border: 1px solid #CCC;
text-shadow: none; text-shadow: none;
} }
.ui-link { .ui-link {