AntonLV 6 лет назад
Родитель
Сommit
2bf94e9beb

+ 25 - 7
modules/boonex/analytics/template/canvas.html

@@ -1,12 +1,30 @@
 <div id="bx_analytics_container">
     <div class="bx_analytics_filters">
-        <select class="bx-def-font-inputs bx-form-input-select bx_analytics_module_selector">
-            <bx_repeat:items>
-                <option value="__value__">__title__</option>
-            </bx_repeat:items>
-        </select>
-        <select class="bx-def-font-inputs bx-form-input-select bx_analytics_report_selector"></select>
-        <input type="text" class="bx-def-font-inputs bx-form-input-select  bx_analytics_date_picker" value="__interval__" />
+        <div class="bx-form-element">
+            <div class="bx-form-value bx-clearfix">
+                <div class="bx-form-input-wrapper bx-form-input-wrapper-select">
+                    <select class="bx-def-font-inputs bx-form-input-select bx_analytics_module_selector">
+                        <bx_repeat:items>
+                            <option value="__value__">__title__</option>
+                        </bx_repeat:items>
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="bx-form-element">
+            <div class="bx-form-value bx-clearfix">
+                <div class="bx-form-input-wrapper bx-form-input-wrapper-select">
+                    <select class="bx-def-font-inputs bx-form-input-select bx_analytics_report_selector"></select>
+                </div>
+            </div>
+        </div>
+         <div class="bx-form-element">
+            <div class="bx-form-value bx-clearfix">
+                <div class="bx-form-input-wrapper bx-form-input-wrapper-select">
+                    <input type="text" class="bx-def-font-inputs bx-form-input-select bx_analytics_date_picker" value="__interval__" />
+                </div>
+            </div>
+        </div>
     </div>
     <div class="bx_analytics_data">
         <div class="bx_analytics_grath_cnt bx-def-margin-top">

+ 5 - 8
modules/boonex/analytics/template/css/main.css

@@ -1,28 +1,25 @@
-.bx_analytics_filters
-{
-    display: -webkit-box;
+.bx_analytics_filters {
     display: -webkit-flex;
     display: -ms-flexbox;
     display: flex;
-    -webkit-box-align: stretch;
     -webkit-align-items: stretch;
     -ms-flex-align: stretch;
     align-items: stretch;
     -webkit-flex-wrap: wrap;
     -ms-flex-wrap: wrap;
     flex-wrap: wrap;
-    -webkit-box-pack: start;
-    -ms-flex-pack: start;
-    plex-pack: start;
     -webkit-justify-content: space-between;
     justify-content: space-between;
 }
 
+.bx_analytics_filters .bx-form-element {
+    width: 30%;
+}
+
 .bx_analytics_filters .bx-def-font-inputs{
     position: relative;
     display: inline-block;
     overflow: hidden;
-    width: calc(33% - 1rem);
 }
 
 .bx_analytics_data .bx-def-font-inputs {

+ 10 - 6
modules/boonex/charts/template/chart-growth.html

@@ -1,10 +1,14 @@
 <bx_if:show_module_selector>
-    <div>
-        <select class="bx-def-font-inputs bx-form-input-select bx_chart_growth_selector___chart_name__">
-            <bx_repeat:items>
-                <option value="__value__">__title__</option>
-            </bx_repeat:items>
-        </select>
+    <div class="bx-form-element">
+        <div class="bx-form-value bx-clearfix">
+            <div class="bx-form-input-wrapper bx-form-input-wrapper-select">
+                <select class="bx-def-font-inputs bx-form-input-select bx_chart_growth_selector___chart_name__">
+                    <bx_repeat:items>
+                        <option value="__value__">__title__</option>
+                    </bx_repeat:items>
+                </select>
+            </div>
+        </div>
     </div>
 </bx_if:show_module_selector>
 __chart__

+ 5 - 4
modules/boonex/market/template/css/main.css

@@ -54,10 +54,11 @@ div.bx-market-unit-icon {
     left: 0px;
 }
 div.bx-market-unit-icon-empty {
-	background-color: #ffffff;
-	text-align: center;
-	font-size: 32px;
-	font-size: 2rem;
+    background-color: #ffffff;
+    text-align: center;
+    line-height: 3rem;
+    font-size: 32px;
+    font-size: 2rem;
 }
 div.bx-market-unit-icon-empty .sys-icon {
     vertical-align: top;	

+ 1 - 1
template/scripts/BxBaseAcl.php

@@ -43,7 +43,7 @@ class BxBaseAcl extends BxDolAcl
         $sContent = $oTemplate->parseHtmlByName('acl_membership.html', array(
             'html_id' => 'sys-acl-profile-' . $iProfileId,
             'level' => _t($aLevel['name']),
-            'thumbnail' => $oTemplate->getImage($aLevelInfo['icon'], array('class' => 'bx-acl-m-thumbnail bx-def-border')),
+            'thumbnail' => $oTemplate->getImage($aLevelInfo['icon'], array('class' => 'bx-acl-m-thumbnail')),
             'bx_if:show_private_info' => array(
                 'condition' => $bTmplVarsPrivateInfo,
                 'content' => $aTmplVarsPrivateInfo