Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
jpb
2021-08-12 09:36:34 +02:00
parent 04d406bd39 340949e0a9
commit b1cba14718
80 changed files with 1237 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -647,6 +647,9 @@ textarea.centpercent {
.large {
font-size: 125%;
}
.double {
font-size: 2em;
}
.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
font-size: 65%;
@@ -736,6 +739,9 @@ textarea.centpercent {
.paddingleft2 {
padding-<?php print $left; ?>: 2px;
}
.paddingleft2imp {
padding-<?php print $left; ?>: 2px !important;
}
.paddingright {
padding-<?php print $right; ?>: 4px;
}

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

@@ -878,12 +878,18 @@ textarea.centpercent {
.paddingleft2 {
padding-<?php print $left; ?>: 2px;
}
.paddingleft2imp {
padding-<?php print $left; ?>: 2px !important;
}
.paddingright {
padding-<?php print $right; ?>: 4px;
}
.paddingright2 {
padding-<?php print $right; ?>: 2px;
}
.paddingright2imp {
padding-<?php print $right; ?>: 2px !important;
}
.marginleft2 {
margin-<?php print $left; ?>: 2px;
}