Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2017-02-28 13:45:51 +01:00
commit c2c69620eb
2 changed files with 18 additions and 11 deletions

View File

@ -2787,7 +2787,7 @@ div.tabBar .noborder {
border: none;
}
.boxstats {
<?php print "float: ".$left.";\n"; ?>
display: inline-block;
margin: 3px;
padding: 3px;
/*-moz-box-shadow: 3px 3px 4px #DDD;
@ -2797,6 +2797,11 @@ div.tabBar .noborder {
border: 1px solid #CCC;
text-align: center;
border-radius: 2px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 110px;
}
.boxstats:hover {
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
@ -2821,12 +2826,11 @@ span.dashboardlineko {
font-weight: bold;
}
.boxtable {
/* -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; */
margin-bottom: 8px !important;
}
.tdboxstats {
text-align: center;
}
.box {
padding-right: 0px;

View File

@ -2666,7 +2666,7 @@ div .tdtop {
border: none;
}
.boxstats {
<?php print "float: ".$left.";\n"; ?>
display: inline-block;
margin: 3px;
padding: 3px;
/*-moz-box-shadow: 3px 3px 4px #f4f4f4;
@ -2677,6 +2677,11 @@ div .tdtop {
text-align: center;
border-radius: 2px;
min-height: 38px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 110px;
}
.boxstats:hover {
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
@ -2700,14 +2705,12 @@ span.dashboardlineko {
color: #880000;
font-weight: bold;
}
.boxtable {
-moz-box-shadow: 3px 3px 4px #f4f4f4;
-webkit-box-shadow: 3px 3px 4px #f4f4f4;
box-shadow: 3px 3px 4px #f4f4f4;
margin-bottom: 8px !important;
}
.tdboxstats {
text-align: center;
}
.box {
padding-right: 0px;