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

Merge pull request #11681 from hregis/10.0_mc

Browse Source 
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
This commit is contained in:
Laurent Destailleur 2019-08-15 19:08:42 +02:00 committed by GitHub
commit 9cb5ba35dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ function dolKeepOnlyPhpCode($str)
* @return void * @return void
* @see dolWebsiteReplacementOfLinks() for function used to replace content in the backoffice context. * @see dolWebsiteReplacementOfLinks() for function used to replace content in the backoffice context.
*/ */
function dolWebsiteOutput($content, $contenttype='html') function dolWebsiteOutput($content, $contenttype = 'html')
{ {
global $db, $langs, $conf, $user; global $db, $langs, $conf, $user;
global $dolibarr_main_url_root, $dolibarr_main_data_root; global $dolibarr_main_url_root, $dolibarr_main_data_root;

10
htdocs/theme/eldy/global.inc.php
View File

@ -3080,6 +3080,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
.box { .box {
overflow-x: auto; overflow-x: auto;
min-height: 40px; min-height: 40px;
padding-right: 0px;
padding-left: 0px;
/*padding-bottom: 25px;*/
padding-bottom: 10px;
} }
.ficheaddleft div.boxstats, .ficheaddright div.boxstats { .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
border: none; border: none;
@ -3266,12 +3270,6 @@ a.valignmiddle.dashboardlineindicator {
line-height: 30px; line-height: 30px;
} }
.box {
padding-right: 0px;
padding-left: 0px;
padding-bottom: 25px;
}
tr.box_titre { tr.box_titre {
height: 26px; height: 26px;

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

@ -3344,6 +3344,9 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
.box { .box {
overflow-x: auto; overflow-x: auto;
min-height: 40px; min-height: 40px;
padding-right: 0px;
padding-left: 0px;
padding-bottom: 12px;
} }
.ficheaddleft div.boxstats, .ficheaddright div.boxstats { .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
border: none; border: none;
@ -3470,12 +3473,6 @@ a.valignmiddle.dashboardlineindicator {
line-height: 30px; line-height: 30px;
} }
.box {
padding-right: 0px;
padding-left: 0px;
padding-bottom: 12px;
}
tr.box_titre { tr.box_titre {
height: 26px !important; height: 26px !important;