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

FIX dark theme

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-22 21:11:28 +01:00
parent d1c8610ed2
commit 020177a778
2 changed files with 78 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,9 @@
if (!empty($conf->global->THEME_DARKMODEENABLED)) { if (!empty($conf->global->THEME_DARKMODEENABLED)) {
print "/* For dark mode */\n"; print "/* For dark mode */\n";
if ($conf->global->THEME_DARKMODEENABLED != 2) { if ($conf->global->THEME_DARKMODEENABLED != 2) {
print "@media (prefers-color-scheme: dark) {"; print "@media not print and (prefers-color-scheme: dark) {";
} else {
print "@media not print {";
} }
print ":root { print ":root {
--colorbackhmenu1: #3d3e40; --colorbackhmenu1: #3d3e40;
@ -109,10 +111,8 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
body, button { body, button {
color: #bbb; color: #bbb;
}\n
}\n"; }\n";
if ($conf->global->THEME_DARKMODEENABLED != 2) {
print "}\n";
}
} }
?> ?>
@ -3238,7 +3238,6 @@ div.blockvmenubookmarks
div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
color: #000000;
text-align: <?php print $left; ?>; text-align: <?php print $left; ?>;
text-decoration: none; text-decoration: none;
padding-left: 5px; padding-left: 5px;
@ -3247,6 +3246,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen
padding-bottom: 7px; padding-bottom: 7px;
margin: 0 0 0 2px; margin: 0 0 0 2px;
color: var(--colortext);
background: var(--colorbackvmenu1); background: var(--colorbackvmenu1);
border-left: 1px solid #AAA; border-left: 1px solid #AAA;
@ -4183,7 +4183,7 @@ tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
border-bottom: 0px !important; border-bottom: 0px !important;
} }
table.nobottomiftotal tr.liste_total td { table.nobottomiftotal tr.liste_total td {
background-color: #fff; background-color: var(--inputbackgroundcolor);
<?php if (!$userborderontable) { ?> <?php if (!$userborderontable) { ?>
border-bottom: 0px !important; border-bottom: 0px !important;
<?php } ?> <?php } ?>

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

@ -320,7 +320,9 @@ print '*/'."\n";
--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>); --colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
--colorbackbody: rgb(<?php print $colorbackbody; ?>); --colorbackbody: rgb(<?php print $colorbackbody; ?>);
--colorbackmobilemenu: #f8f8f8; --colorbackmobilemenu: #f8f8f8;
--colorbackgrey: #f0f0f0;
--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>); --colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
--colortexttitle: rgb(<?php print $colortexttitle; ?>); --colortexttitle: rgb(<?php print $colortexttitle; ?>);
--colortexttitlelink: rgba(<?php print $colortexttitlelink; ?>, 0.9); --colortexttitlelink: rgba(<?php print $colortexttitlelink; ?>, 0.9);
--colortext: rgb(<?php print $colortext; ?>); --colortext: rgb(<?php print $colortext; ?>);
@ -330,6 +332,8 @@ print '*/'."\n";
--colortopbordertitle1: rgb(<?php print $colortopbordertitle1; ?>); --colortopbordertitle1: rgb(<?php print $colortopbordertitle1; ?>);
--listetotal: #551188; --listetotal: #551188;
--inputbackgroundcolor: #FFF; --inputbackgroundcolor: #FFF;
--inputbackgroundcolordisabled: #eee;
--inputcolordisabled: rgb(80, 80, 80);
--inputbordercolor: rgba(0,0,0,.2); --inputbordercolor: rgba(0,0,0,.2);
--tooltipbgcolor: <?php print $toolTipBgColor; ?>; --tooltipbgcolor: <?php print $toolTipBgColor; ?>;
--tooltipfontcolor : <?php print $toolTipFontColor; ?>; --tooltipfontcolor : <?php print $toolTipFontColor; ?>;
@ -347,10 +351,71 @@ print '*/'."\n";
--productlinestockod: #002200; --productlinestockod: #002200;
--productlinestocktoolow: #884400; --productlinestocktoolow: #884400;
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8); --infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
--tablevalidbgcolor: rgb(252, 248, 227);
--butactionbg : #<?php print $butactionbg; ?>; --butactionbg : #<?php print $butactionbg; ?>;
--textbutaction : #<?php print $textbutaction; ?>; --textbutaction : #<?php print $textbutaction; ?>;
} }
<?php
if (!empty($conf->global->THEME_DARKMODEENABLED)) {
print "/* For dark mode */\n";
if ($conf->global->THEME_DARKMODEENABLED != 2) {
print "@media not print and (prefers-color-scheme: dark) {";
} else {
print "@media not print {";
}
print ":root {
--colorbackhmenu1: #3d3e40;
--colorbackvmenu1: #2b2c2e;
--colorbacktitle1: #2b2d2f;
--colorbacktabcard1: #1d1e20; /* Must be same than colorbackbody */
--colorbacktabactive: rgb(220,220,220);
--colorbacklineimpair1: #38393d;
--colorbacklineimpair2: #2b2d2f;
--colorbacklinepair1: #38393d;
--colorbacklinepair2: #2b2d2f;
--colorbacklinepairhover: #2b2d2f;
--colorbacklinepairchecked: #0e5ccd;
--colorbackbody: #1d1e20;
--colorbackmobilemenu: #080808;
--colorbackgrey: #0f0f0f;
--tooltipbgcolor: #2b2d2f;
--colortexttitlenotab: rgb(220,220,220);
--colortexttitlenotab2: rgb(220,220,220);
--colortexttitle: rgb(220,220,220);
--colortext: rgb(220,220,220);
--colortextlink: #4390dc;
--colortexttitlelink: #4390dc;
--colortextbackhmenu: rgb(220,220,220);
--colortextbackvmenu: rgb(220,220,220);
--tooltipfontcolor : rgb(220,220,220);
--listetotal: rgb(245, 83, 158);
--inputbackgroundcolor: rgb(70, 70, 70);
--inputbackgroundcolordisabled: rgb(60, 60, 60);
--inputcolordisabled: rgb(140, 140, 140);
--inputbordercolor: rgb(220,220,220);
--oddevencolor: rgb(220,220,220);
--colorboxstatsborder: rgb(65,100,138);
--dolgraphbg: #1d1e20;
--fieldrequiredcolor: rgb(250,183,59);
--colortextbacktab: rgb(220,220,220);
--colorboxiconbg: rgb(36,38,39);
--refidnocolor: rgb(220,220,220);
--tableforfieldcolor:rgb(220,220,220);
--amountremaintopaycolor:rgb(252,84,91);
--amountpaymentcomplete:rgb(101,184,77);
--amountremaintopaybackcolor:rbg(245,130,46);
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #000, #000, #000, #274231);
--tablevalidbgcolor: rgb(80, 64, 33);
}
body, button {
color: #bbb;
}\n
}\n";
}
?>
body { body {
<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?> <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
background-color: #FFFFFF; background-color: #FFFFFF;
@ -452,7 +517,7 @@ input, select {
} }
#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) { #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
background: var(--butactionbg); background: var(--butactionbg);
color: var(--textbutaction)!important; color: var(--textbutaction) !important;
border-radius: 3px; border-radius: 3px;
border-collapse: collapse; border-collapse: collapse;
border: none; border: none;
@ -3201,7 +3266,6 @@ li#mainmenutd_companylogo {
div.blockvmenupair, div.blockvmenuimpair div.blockvmenupair, div.blockvmenuimpair
{ {
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
color: #000000;
text-align: <?php print $left; ?>; text-align: <?php print $left; ?>;
text-decoration: none; text-decoration: none;
padding-left: 5px; padding-left: 5px;
@ -3210,6 +3274,9 @@ div.blockvmenupair, div.blockvmenuimpair
padding-bottom: 3px; padding-bottom: 3px;
margin: 1px 0px 8px 0px; margin: 1px 0px 8px 0px;
color: var(--colortext);
background: var(--colorbackvmenu1);
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #e0e0e0; border-bottom: 1px solid #e0e0e0;
} }
@ -4118,7 +4185,7 @@ tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
} }
/* /*
table.nobottomiftotal tr.liste_total td { table.nobottomiftotal tr.liste_total td {
background-color: #fff; background-color: var(--inputbackgroundcolor);
<?php if (!$userborderontable) { ?> <?php if (!$userborderontable) { ?>
border-bottom: 0px !important; border-bottom: 0px !important;
<?php } ?> <?php } ?>