AntonLV 6 лет назад
Родитель
Сommit
646a2a420a

+ 4 - 4
modules/boonex/decorous/data/template/bx_timeline/css/view.less

@@ -2,8 +2,8 @@
 @import '../../../../../timeline/template/css/view.css';
 
 div.bx-tl-item-text div.bx-tl-content.bx-tl-overflow:before {
-    background: -webkit-linear-gradient(top, transparent, @bx-color-box);
-    background: -moz-linear-gradient(top, transparent, @bx-color-box);
-    background: -o-linear-gradient(top, transparent, @bx-color-box);
-    background: linear-gradient(to bottom, transparent, @bx-color-box);
+    background: -webkit-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: -moz-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: -o-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: linear-gradient(to bottom, @bx-color-box-transparent, @bx-color-box);
 }

+ 8 - 0
modules/boonex/decorous/data/template/system/scripts/BxTemplConfig.php

@@ -130,11 +130,19 @@ class BxTemplConfig extends BxBaseConfig
         $this->_aConfig['aLessConfig']['bx-color-header'] = $this->_setColorRgba($sName . '_header_bg_color', 'rgba(59, 134, 134, 1)');
         $this->_aConfig['aLessConfig']['bx-color-footer'] = $this->_setColorRgba($sName . '_footer_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-page'] = $this->_setColorRgb($sName . '_body_bg_color', 'rgb(255, 255, 255)');
+        $this->_aConfig['aLessConfig']['bx-color-page-gradient-left'] = $this->_setGradientLeft($sName . '_body_bg_color', '242, 242, 242');
+        $this->_aConfig['aLessConfig']['bx-color-page-gradient-right'] = $this->_setGradientRight($sName . '_body_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-cover'] = $this->_setColorRgba($sName . '_cover_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-block'] = $this->_setColorRgba($sName . '_block_bg_color', 'rgba(255, 255, 255, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-block-transparent'] = $this->_setColorRgbaCustom($sName . '_block_bg_color', '0', 'rgba(255, 255, 255, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-block-gradient-left'] = $this->_setGradientLeft($sName . '_block_bg_color', '242, 242, 242');
+        $this->_aConfig['aLessConfig']['bx-color-block-gradient-right'] = $this->_setGradientRight($sName . '_block_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-block-title'] = $this->_setColorRgba($sName . '_block_title_bg_color', 'rgba(255, 255, 255, 1.0)');
         $this->_aConfig['aLessConfig']['bx-color-block-title-div'] = $this->_setColorRgba($sName . '_block_title_div_bg_color', 'rgba(208, 208, 208, 1)');        
         $this->_aConfig['aLessConfig']['bx-color-box'] = $this->_setColorRgba($sName . '_card_bg_color', 'rgba(242, 242, 242, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-box-transparent'] = $this->_setColorRgbaCustom($sName . '_card_bg_color', '0', 'rgba(242, 242, 242, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-box-gradient-left'] = $this->_setGradientLeft($sName . '_card_bg_color', '242, 242, 242');
+        $this->_aConfig['aLessConfig']['bx-color-box-gradient-right'] = $this->_setGradientRight($sName . '_card_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-box-hover'] = $this->_setColorRgba($sName . '_card_bg_color_hover', 'rgba(242, 242, 242, 0.5)');
         $this->_aConfig['aLessConfig']['bx-color-popup'] = $this->_setColorRgba($sName . '_popup_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-popup-title'] = $this->_setColorRgba($sName . '_popup_title_bg_color', 'rgba(40, 60, 80, 0.9)');

+ 1 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -1713,7 +1713,7 @@
 	<string name="_month_prev"><![CDATA[Previous Month]]></string>
 	<string name="_no limit"><![CDATA[no limit]]></string>
 	<string name="_powered_by"><![CDATA[Powered by]]></string>
-	<string name="_see_more"><![CDATA[see more]]></string>
+	<string name="_see_more"><![CDATA[See more...]]></string>
 	<string name="_show_replacement"><![CDATA[Show]]></string>
 	<string name="_sys_accept"><![CDATA[Accept]]></string>
 	<string name="_sys_accounts"><![CDATA[Accounts]]></string>

+ 4 - 4
modules/boonex/lucid/data/template/bx_timeline/css/view.less

@@ -225,10 +225,10 @@ div.bx-tl-item-text div.bx-tl-content {
     max-height: 250px;
 }
 div.bx-tl-item-text div.bx-tl-content.bx-tl-overflow:before {
-    background: -webkit-linear-gradient(top, transparent, @bx-color-box);
-    background: -moz-linear-gradient(top, transparent, @bx-color-box);
-    background: -o-linear-gradient(top, transparent, @bx-color-box);
-    background: linear-gradient(to bottom, transparent, @bx-color-box);
+    background: -webkit-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: -moz-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: -o-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: linear-gradient(to bottom, @bx-color-box-transparent, @bx-color-box);
 }
 div.bx-tl-item-date {
 	color: #E0E8EB;

+ 8 - 0
modules/boonex/lucid/data/template/system/scripts/BxTemplConfig.php

@@ -131,11 +131,19 @@ class BxTemplConfig extends BxBaseConfig
         $this->_aConfig['aLessConfig']['bx-color-header'] = $this->_setColorRgba($sName . '_header_bg_color', 'rgba(59, 134, 134, 1)');
         $this->_aConfig['aLessConfig']['bx-color-footer'] = $this->_setColorRgba($sName . '_footer_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-page'] = $this->_setColorRgb($sName . '_body_bg_color', 'rgb(255, 255, 255)');
+        $this->_aConfig['aLessConfig']['bx-color-page-gradient-left'] = $this->_setGradientLeft($sName . '_body_bg_color', '242, 242, 242');
+        $this->_aConfig['aLessConfig']['bx-color-page-gradient-right'] = $this->_setGradientRight($sName . '_body_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-cover'] = $this->_setColorRgba($sName . '_cover_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-block'] = $this->_setColorRgba($sName . '_block_bg_color', 'rgba(255, 255, 255, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-block-transparent'] = $this->_setColorRgbaCustom($sName . '_block_bg_color', '0', 'rgba(255, 255, 255, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-block-gradient-left'] = $this->_setGradientLeft($sName . '_block_bg_color', '242, 242, 242');
+        $this->_aConfig['aLessConfig']['bx-color-block-gradient-right'] = $this->_setGradientRight($sName . '_block_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-block-title'] = $this->_setColorRgba($sName . '_block_title_bg_color', 'rgba(255, 255, 255, 1.0)');
         $this->_aConfig['aLessConfig']['bx-color-block-title-div'] = $this->_setColorRgba($sName . '_block_title_div_bg_color', 'rgba(208, 208, 208, 1)');        
         $this->_aConfig['aLessConfig']['bx-color-box'] = $this->_setColorRgba($sName . '_card_bg_color', 'rgba(242, 242, 242, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-box-transparent'] = $this->_setColorRgbaCustom($sName . '_card_bg_color', '0', 'rgba(242, 242, 242, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-box-gradient-left'] = $this->_setGradientLeft($sName . '_card_bg_color', '242, 242, 242');
+        $this->_aConfig['aLessConfig']['bx-color-box-gradient-right'] = $this->_setGradientRight($sName . '_card_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-box-hover'] = $this->_setColorRgba($sName . '_card_bg_color_hover', 'rgba(242, 242, 242, 0.5)');
         $this->_aConfig['aLessConfig']['bx-color-popup'] = $this->_setColorRgba($sName . '_popup_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-popup-title'] = $this->_setColorRgba($sName . '_popup_title_bg_color', 'rgba(40, 60, 80, 0.9)');

+ 4 - 4
modules/boonex/protean/data/template/bx_timeline/css/view.less

@@ -3,10 +3,10 @@
 
 /*--- Item Content Style ---*/
 div.bx-tl-item-text div.bx-tl-content.bx-tl-overflow:before {
-    background: -webkit-linear-gradient(top, rgba(255, 255,255, 0), @bx-color-box);
-    background: -moz-linear-gradient(top, rgba(255, 255,255, 0), @bx-color-box);
-    background: -o-linear-gradient(top, rgba(255, 255,255, 0), @bx-color-box);
-    background: linear-gradient(to bottom, rgba(255, 255,255, 0), @bx-color-box);
+    background: -webkit-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: -moz-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: -o-linear-gradient(top, @bx-color-box-transparent, @bx-color-box);
+    background: linear-gradient(to bottom, @bx-color-box-transparent, @bx-color-box);
 }
 
 /*--- Item Owner Styles ---*/

+ 2 - 0
modules/boonex/protean/data/template/system/scripts/BxTemplConfig.php

@@ -126,11 +126,13 @@ class BxTemplConfig extends BxBaseConfig
         $this->_aConfig['aLessConfig']['bx-color-page-gradient-right'] = $this->_setGradientRight($sName . '_body_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-cover'] = $this->_setColorRgba($sName . '_cover_bg_color', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-block'] = $this->_setColorRgba($sName . '_block_bg_color', 'rgba(255, 255, 255, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-block-transparent'] = $this->_setColorRgbaCustom($sName . '_block_bg_color', '0', 'rgba(255, 255, 255, 1)');
         $this->_aConfig['aLessConfig']['bx-color-block-gradient-left'] = $this->_setGradientLeft($sName . '_block_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-block-gradient-right'] = $this->_setGradientRight($sName . '_block_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-block-title'] = $this->_setColorRgba($sName . '_block_title_bg_color', 'rgba(255, 255, 255, 1.0)');
         $this->_aConfig['aLessConfig']['bx-color-block-title-div'] = $this->_setColorRgba($sName . '_block_title_div_bg_color', 'rgba(208, 208, 208, 1)');
         $this->_aConfig['aLessConfig']['bx-color-box'] = $this->_setColorRgba($sName . '_card_bg_color', 'rgba(242, 242, 242, 1)');
+        $this->_aConfig['aLessConfig']['bx-color-box-transparent'] = $this->_setColorRgbaCustom($sName . '_card_bg_color', '0', 'rgba(242, 242, 242, 1)');
         $this->_aConfig['aLessConfig']['bx-color-box-gradient-left'] = $this->_setGradientLeft($sName . '_card_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-box-gradient-right'] = $this->_setGradientRight($sName . '_card_bg_color', '242, 242, 242');
         $this->_aConfig['aLessConfig']['bx-color-box-hover'] = $this->_setColorRgba($sName . '_card_bg_color_hover', 'rgba(242, 242, 242, 0.5)');

+ 1 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -1700,7 +1700,7 @@
 	<string name="_month_prev"><![CDATA[Предыдущий месяц]]></string>
 	<string name="_no limit"><![CDATA[без ограничений]]></string>
 	<string name="_powered_by"><![CDATA[Регулируется]]></string>
-	<string name="_see_more"><![CDATA[смотреть ещё]]></string>
+	<string name="_see_more"><![CDATA[Смотреть ещё...]]></string>
 	<string name="_show_replacement"><![CDATA[Показать]]></string>
 	<string name="_sys_accept"><![CDATA[Принять]]></string>
 	<string name="_sys_accounts"><![CDATA[Учётные записи]]></string>

+ 1 - 1
modules/boonex/timeline/template/show_more.html

@@ -1 +1 @@
-<div class="__style_prefix__-content-show-more bx-def-padding-thd-top bx-def-font-small" style="display:none;"><a href="javascript:void(0)" onclick="__js_object__.showMore(this);"><bx_text:_see_more /></a></div>
+<div class="__style_prefix__-content-show-more bx-def-padding-thd-top bx-def-font-middle" style="display:none;"><a href="javascript:void(0)" onclick="__js_object__.showMore(this);"><bx_text:_see_more /></a></div>

+ 5 - 0
template/scripts/BxBaseConfig.php

@@ -274,6 +274,11 @@ class BxBaseConfig extends BxDol implements iBxDolSingleton
 
         return $sValue;
     }
+    
+    protected function _setColorRgbaCustom($sKey, $sOpacity, $sDefault = '')
+    {
+        return "rgba(" . $this->_getColorFromRgba($sKey, $sDefault) . ", " . $sOpacity . ")";
+    }
 
     protected function _setGradientLeft($sKey, $sDefault = '')
     {