AntonLV 6 anni fa
parent
commit
8356bf6094
1 ha cambiato i file con 15 aggiunte e 3 eliminazioni
  1. 15 3
      template/scripts/BxBaseConfig.php

+ 15 - 3
template/scripts/BxBaseConfig.php

@@ -277,18 +277,30 @@ class BxBaseConfig extends BxDol implements iBxDolSingleton
     
     
     protected function _setColorRgbaCustom($sKey, $sOpacity, $sDefault = '')
     protected function _setColorRgbaCustom($sKey, $sOpacity, $sDefault = '')
     {
     {
-        return "rgba(" . $this->_getColorFromRgba($sKey, $sDefault) . ", " . $sOpacity . ")";
+        $sDefaultColor = $sDefault;
+        if(strpos($sDefaultColor, 'rgba') !== false)
+            $sDefaultColor = $this->_getColorFromRgba($sDefault);
+
+        return "rgba(" . $this->_getColorFromRgba($sKey, $sDefaultColor) . ", " . $sOpacity . ")";
     }
     }
 
 
     protected function _setGradientLeft($sKey, $sDefault = '')
     protected function _setGradientLeft($sKey, $sDefault = '')
     {
     {
-        $sValue = $this->_getColorFromRgba($sKey, $sDefault);
+        $sDefaultColor = $sDefault;
+        if(strpos($sDefaultColor, 'rgba') !== false)
+            $sDefaultColor = $this->_getColorFromRgba($sDefault);
+
+        $sValue = $this->_getColorFromRgba($sKey, $sDefaultColor);
         return "linear-gradient(to right, rgba(" . $sValue . ", 1) 0%, rgba(" . $sValue . ", 0) 100%)";
         return "linear-gradient(to right, rgba(" . $sValue . ", 1) 0%, rgba(" . $sValue . ", 0) 100%)";
     }
     }
     
     
     protected function _setGradientRight($sKey, $sDefault = '')
     protected function _setGradientRight($sKey, $sDefault = '')
     {
     {
-        $sValue = $this->_getColorFromRgba($sKey, $sDefault);
+        $sDefaultColor = $sDefault;
+        if(strpos($sDefaultColor, 'rgba') !== false)
+            $sDefaultColor = $this->_getColorFromRgba($sDefault);
+
+        $sValue = $this->_getColorFromRgba($sKey, $sDefaultColor);
         return "linear-gradient(to right, rgba(" . $sValue . ", 0) 0%, rgba(" . $sValue . ", 1) 100%)";
         return "linear-gradient(to right, rgba(" . $sValue . ", 0) 0%, rgba(" . $sValue . ", 1) 100%)";
     }
     }