Merge branch 'develop' into patch-36

This commit is contained in:
Laurent Destailleur 2020-02-21 20:12:29 +01:00 committed by GitHub
commit 9a6d6852f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 20 deletions

View File

@ -2,18 +2,17 @@
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
:root {
:root {
--btncolortext:rgb(<?php print $colortextlink; ?>); --btncolortext:rgb(<?php print $colortextlink; ?>);
--btncolorbg: #fbfbfb; --btncolorbg: #fbfbfb;
--btncolorborderhover: none; --btncolorborderhover: none;
--btncolorborder: #FFF; --btncolorborder: #FFF;
--butactionbg:rgb(225, 231, 225); --butactionbg:rgb(225, 231, 225);
--butactiondeletebg: rgb(234,228,225); --butactiondeletebg: rgb(234,228,225);
}
}
<?php <?php
if (!empty($conf->global->DMAIN_THEME_DARKMODEENABLED)) { if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
print " print "
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {
:root { :root {

View File

@ -5,8 +5,7 @@
/* Default styles */ /* Default styles */
/* ============================================================================== */ /* ============================================================================== */
:root { :root {
--colorbackhmenu1: rgb(<?php print $colorbackhmenu1; ?>); --colorbackhmenu1: rgb(<?php print $colorbackhmenu1; ?>);
--colorbackvmenu1: rgb(<?php print $colorbackvmenu1; ?>); --colorbackvmenu1: rgb(<?php print $colorbackvmenu1; ?>);
--colorbacktitle1: rgb(<?php print $colorbacktitle1; ?>); --colorbacktitle1: rgb(<?php print $colorbacktitle1; ?>);
@ -42,7 +41,8 @@
--amountpaymentcomplete:#008800; --amountpaymentcomplete:#008800;
--amountremaintopaybackcolor:none; --amountremaintopaybackcolor:none;
} }
<?php <?php
if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) { if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
print "@media (prefers-color-scheme: dark) { print "@media (prefers-color-scheme: dark) {