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

CSS

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-01 02:37:18 +01:00
parent f545d2a134
commit 6f29a574cf
6 changed files with 74 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/card.php
View File

@ -550,7 +550,7 @@ if ($object->id > 0)
}
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
print '<div class="underbanner clearboth"></div>';
$boxstat = '';
@ -559,7 +559,7 @@ if ($object->id > 0)
// Lien recap
$boxstat.='<div class="box">';
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom" width="100%">';
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
if (! empty($conf->propal->enabled))

6
htdocs/contrat/card.php
View File

@ -1527,10 +1527,10 @@ else
// Title line for service
$cursorline=1;
print '<div id="contrat-lines-container" data-contractid="'.$object->id.'" data-element="'.$object->element.'" >';
while ($cursorline <= $nbofservices)
while ($cursorline <= $nbofservices)
{
print '<div id="contrat-line-container'.$object->lines[$cursorline-1]->id.'" data-contratlineid = "'.$object->lines[$cursorline-1]->id.'" data-element="'.$object->lines[$cursorline-1]->element.'" >';
print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
print '<form name="update" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="updateline">';
print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline-1]->id.'">';
@ -1875,7 +1875,7 @@ else
// Area with status and activation info of line
if ($object->statut > 0)
{
print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
print '<tr '.$bcnd[$var].'>';
print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';

2
htdocs/core/lib/product.lib.php
View File

@ -311,7 +311,7 @@ function show_stats_for_company($product,$socid)
$nblines = 0;
print '<tr class="liste_titre">';
print '<td align="left" class="tdtop" width="25%">'.$langs->trans("Referers").'</td>';
print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';

16
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -131,7 +131,7 @@ if ($nolinesbefore) {
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
$coldisplay=2;
?>
<td class="nobottom linecolnum" align="center" width="5">
<td class="nobottom linecolnum" align="center" width="5"></td>
<?php
}
else {
@ -142,7 +142,7 @@ else {
<td class="nobottom linecoldescription minwidth500imp">
<?php
$freelines = false;
if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
{
@ -153,7 +153,7 @@ else {
if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
else $forceall=0;
}
// Free line
echo '<span class="prod_entry_mode_free">';
// Show radio free line
@ -180,9 +180,9 @@ else {
echo ' ';
}
}
echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall);
echo '</span>';
}
@ -408,6 +408,10 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
{
$colspan = 6;
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines
{
$colspan++;
}
if ($this->situation_cycle_ref) {
$colspan++;
}
@ -595,7 +599,7 @@ jQuery(document).ready(function() {
setforpredef();
jQuery('#trlinefordates').show();
});
<?php
if(!$freelines) { ?>
$("#prod_entry_mode_predef").click();

82
htdocs/theme/eldy/style.css.php
View File

@ -38,7 +38,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
// Colors
$colorbackhmenu1='80,90,120'; // topmenu
$colorbackvmenu1='248,248,248'; // vmenu
$colortopbordertitle1='120,120,120'; // top border of title
$colortopbordertitle1='200,200,200'; // top border of title
$colorbacktitle1='230,230,233'; // title of tables,list
$colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234';
@ -102,7 +102,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
//var_dump($user->conf->THEME_ELDY_RGB);
$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:0);
$borderwith=2;
$borderwidth=1;
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@ -468,9 +468,6 @@ input[name=price], input[name=weight], input[name=volume], input[name=surface],
input[name=surface] { margin-right: 4px; }
fieldset { border: 1px solid #AAAAAA !important; }
.legendforfieldsetstep { padding-bottom: 10px; }
.trextrafieldseparator td {
border-bottom: 2px solid rgb(120,120,120) !important;
}
input#onlinepaymenturl, input#directdownloadlink {
opacity: 0.7;
}
@ -1404,8 +1401,13 @@ img.photorefnoborder {
.underrefbanner {
}
.underbanner {
border-bottom: <?php echo $borderwith ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
/* border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>); */
border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>);
}
.trextrafieldseparator td {
border-bottom: 2px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
}
.tdhrthin {
margin: 0;
padding-bottom: 0 !important;
@ -2256,7 +2258,8 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
border-right: 1px solid #AAA !important;
border-left: 1px solid #AAA !important;
border-top: 2px solid rgb(<?php echo $colortopbordertitle1; ?>) !important;
/* border-top: <?php echo 2; ?>px solid rgb(<?php echo $colortopbordertitle1; ?>) !important; */
border-top: <?php echo 2; ?>px solid rgb(<?php echo $colorbackhmenu1 ?>) !important;
}
a.tab:hover
{
@ -2476,21 +2479,21 @@ td.border, div.tagtable div div.border {
.noborderbottom {
border-bottom: none !important;
}
.ficheaddleft table.noborder {
/*.ficheaddleft table.noborder {
margin: 0px 0px 0px 0px;
}
}*/
table.liste, table.noborder, table.formdoc, div.noborder {
width: 100%;
border-collapse: separate !important;
border-spacing: 0px;
border-top-width: <?php echo $borderwith ?>px;
border-top-width: <?php echo $borderwidth ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
border-bottom-width: 1px;
border-bottom-color: #BBB;
border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-bottom-style: solid;
margin: 0px 0px 5px 0px;
@ -2510,13 +2513,19 @@ table.paddingtopbottomonly tr td {
background: rgb(<?php echo $colorbacktitle1; ?>) !important;
}
tr.liste_titre_filter td.liste_titre {
border-bottom: 1px solid #ddd;
/* border-bottom: 1px solid #ddd; */
}
.liste_titre_create td, .liste_titre_create th, .liste_titre_create .tagtd
{
/*border-top-width: 1px;
border-top-width: 1px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;*/
border-top-style: solid;
}
/*.liste_titre_create td.nobottom, tr#trlinefordates td {
background-color: rgb(<?php echo $colorbacktitle1; ?>) !important;
}*/
tr#trlinefordates td {
border-bottom: 0px !important;
}
.liste_titre_add td, .liste_titre_add th, .liste_titre_add .tagtd
{
@ -2531,7 +2540,7 @@ table.liste tr, table.noborder tr, div.noborder form {
table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.noborder tr.box_titre td {
padding: 7px 8px 7px 8px; /* t r b l */
}
table.liste td, table.noborder td, div.noborder form div {
table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
padding: 7px 8px 7px 8px; /* t r b l */
line-height: 1.2em;
}
@ -2806,7 +2815,7 @@ div.liste_titre {
padding-bottom: 2px;
}
div.liste_titre_bydiv {
border-top-width: <?php echo $borderwith ?>px;
border-top-width: <?php echo $borderwidth ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
@ -2831,7 +2840,7 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
{
background: rgb(<?php echo $colorbacktitle1; ?>);
font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
border-bottom: 1px solid #ddd;
/* border-bottom: 1px solid #ddd; */
color: rgb(<?php echo $colortexttitle; ?>);
font-family: <?php print $fontlist ?>;
@ -2839,10 +2848,11 @@ div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_se
}
tr.liste_titre th, tr.liste_titre td, th.liste_titre
{
border-bottom: 1px solid #888;
border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
tr.liste_titre:first-child th, tr:first-child th.liste_titre {
border-bottom: 1px solid #ddd ! important;
/* border-bottom: 1px solid #ddd ! important; */
border-bottom: unset;
}
tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div
{
@ -2855,7 +2865,7 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
text-shadow: none !important;
}
tr.liste_titre_topborder td {
border-top-width: <?php echo $borderwith; ?>px;
border-top-width: <?php echo $borderwidth; ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
}
@ -2870,7 +2880,8 @@ tr.liste_titre_topborder td {
background: transparent;
}
tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd { /* For last line of table headers only */
border-bottom: 1px solid #ddd;
/* border-bottom: 1px solid #ddd; */
border-bottom: unset;
}
@ -2904,16 +2915,22 @@ form.liste_total div {
tr.liste_sub_total, tr.liste_sub_total td {
border-bottom: 1px solid #aaa;
}
/* to avoid too much border on contract card */
.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
background: #FFF;
}
.tableforservicepart1 tbody tr td, .tableforservicepart2 tbody tr td {
border-bottom: none;
}
table.tableforservicepart1:first-of-type tr:first-of-type td {
border-top: 1px solid #888;
}
table.tableforservicepart1 tr td {
border-top: 0px;
}
.paymenttable, .margintable {
border-top-width: <?php echo $borderwith ?>px !important;
border-top-width: <?php echo $borderwidth ?>px !important;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
border-top-style: solid !important;
margin: 0px 0px 0px 0px !important;
@ -2935,13 +2952,14 @@ div.tabBar .noborder {
}
#tablelines tr.liste_titre td, .paymenttable tr.liste_titre td, .margintable tr.liste_titre td, .tableforservicepart1 tr.liste_titre td {
border-bottom: 1px solid #AAA !important;
border-bottom: 1px solid rgb(<?php echo $colortopbordertitle1 ?>) !important;
}
/* Prepare to remove class pair - impair */
.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre) {
.noborder > tbody > tr:nth-child(even):not(.liste_titre), .liste > tbody > tr:nth-child(even):not(.liste_titre),
.border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre) {
background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
@ -2952,7 +2970,9 @@ div.tabBar .noborder {
border-bottom: 1px solid #ddd;
}
.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre) {
.noborder > tbody > tr:nth-child(odd):not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(.liste_titre),
.border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre)
{
background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
@ -2965,10 +2985,6 @@ div.tabBar .noborder {
ul.noborder li:nth-child(even):not(.liste_titre) {
background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
background-color: rgb(<?php echo $colorbacklinepair2; ?>) !important;
}
@ -3111,7 +3127,7 @@ a.valignmiddle.dashboardlineindicator {
.box {
padding-right: 0px;
padding-left: 0px;
padding-bottom: 12px;
padding-bottom: 25px;
}
tr.box_titre {
@ -3451,6 +3467,10 @@ div.ui-tooltip {
/* Calendar */
/* ============================================================================== */
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default, .ui-button, html .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active {
border: unset;
}
img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
.ui-datepicker-trigger {

14
htdocs/theme/md/style.css.php
View File

@ -103,7 +103,7 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
//var_dump($user->conf->THEME_ELDY_RGB);
$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
$borderwith=2;
$borderwidth=2;
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@ -1413,7 +1413,7 @@ img.photorefnoborder {
.underrefbanner {
}
.underbanner {
border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
border-bottom: <?php echo $borderwidth; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
.tdhrthin {
margin: 0;
@ -2524,7 +2524,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-collapse: separate !important;
border-spacing: 0px;
border-top-width: <?php echo $borderwith ?>px;
border-top-width: <?php echo $borderwidth ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
@ -2585,7 +2585,7 @@ tr.liste_titre_filter td.liste_titre {
table.liste th, table.noborder th, table.noborder tr.liste_titre td {
padding: 8px 6px 8px 6px; /* t r b l */
}
table.noborder td, div.noborder form, div.noborder form div {
table.noborder td, div.noborder form, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
padding: 4px 6px 4px 6px; /* t r b l */
}
@ -2884,7 +2884,7 @@ div.liste_titre {
border-top-style: solid;
}
div.liste_titre_bydiv {
border-top-width: <?php echo $borderwith ?>px;
border-top-width: <?php echo $borderwidth ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
@ -2927,7 +2927,7 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
text-shadow: none !important;
}
tr.liste_titre_topborder td {
border-top-width: <?php echo $borderwith; ?>px;
border-top-width: <?php echo $borderwidth; ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
}
@ -2987,7 +2987,7 @@ tr.liste_sub_total, tr.liste_sub_total td {
}
.paymenttable, .margintable {
border-top-width: <?php echo $borderwith ?>px !important;
border-top-width: <?php echo $borderwidth ?>px !important;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
border-top-style: solid !important;
margin: 0px 0px 0px 0px !important;