1
0
Эх сурвалжийг харах

Ticket #255 - reduce gap between page blocks.

AntonLV 10 жил өмнө
parent
commit
72f88441bb

+ 1 - 1
modules/boonex/uni/install/sql/install.sql

@@ -95,7 +95,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 (@iCategoryId, CONCAT(@sName, '_block_bg_image'), '_bx_uni_stg_cpt_option_block_bg_image', '', 'image', '', '', '', 2),
 (@iCategoryId, CONCAT(@sName, '_block_bg_image_repeat'), '_bx_uni_stg_cpt_option_block_bg_image_repeat', 'no-repeat', 'select', 'no-repeat,repeat,repeat-x,repeat-y', '', '', 3),
 (@iCategoryId, CONCAT(@sName, '_block_bg_image_size'), '_bx_uni_stg_cpt_option_block_bg_image_size', 'cover', 'select', 'auto,cover,contain', '', '', 4),
-(@iCategoryId, CONCAT(@sName, '_block_content_padding'), '_bx_uni_stg_cpt_option_block_content_padding', 'inherit', 'digit', '', '', '', 5),
+(@iCategoryId, CONCAT(@sName, '_block_content_padding'), '_bx_uni_stg_cpt_option_block_content_padding', '1rem', 'digit', '', '', '', 5),
 (@iCategoryId, CONCAT(@sName, '_block_border_color'), '_bx_uni_stg_cpt_option_block_border_color', 'rgba(208, 208, 208, 1)', 'rgba', '', '', '', 6),
 (@iCategoryId, CONCAT(@sName, '_block_border_size'), '_bx_uni_stg_cpt_option_block_border_size', '0px', 'digit', '', '', '', 7),
 (@iCategoryId, CONCAT(@sName, '_block_border_radius'), '_bx_uni_stg_cpt_option_block_border_radius', '0px', 'digit', '', '', '', 8),

+ 1 - 1
template/css/common.css

@@ -14,7 +14,7 @@ a {
 }
 
 a:hover {
-    text-decoration:underline;
+    text-decoration:none;
 }
 
 a > img {

+ 2 - 2
template/layout_2_columns.html

@@ -2,12 +2,12 @@
 <div class="bx-layout-wrapper bx-layout-2-columns">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2 bx-layout-column-half">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>

+ 3 - 3
template/layout_3_columns.html

@@ -2,17 +2,17 @@
 <div class="bx-layout-wrapper bx-layout-3-columns">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column2 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-leftright" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-leftright" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column3 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>

+ 2 - 2
template/layout_bar_left.html

@@ -2,12 +2,12 @@
 <div class="bx-layout-wrapper bx-layout-bar-left">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-left-content bx-layout-column-wide">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>

+ 2 - 2
template/layout_bar_right.html

@@ -2,12 +2,12 @@
 <div class="bx-layout-wrapper bx-layout-bar-right">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content bx-layout-column-wide">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
                 __cell_1__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-right-bar bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>

+ 2 - 2
template/layout_bottom_area_2_columns.html

@@ -3,12 +3,12 @@
 
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2 bx-layout-column-half">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>

+ 2 - 2
template/layout_top_area_2_columns.html

@@ -5,12 +5,12 @@
 
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-half">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2 bx-layout-column-half">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>

+ 3 - 3
template/layout_top_area_3_columns.html

@@ -5,17 +5,17 @@
 
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column2 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-leftright" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-leftright" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column3 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-4">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-4">
                 __cell_4__
             </div>
         </div>

+ 2 - 2
template/layout_top_area_bar_left.html

@@ -5,12 +5,12 @@
 
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-left-content bx-layout-column-wide">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>

+ 2 - 2
template/layout_top_area_bar_right.html

@@ -5,12 +5,12 @@
 
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content bx-layout-column-wide">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-right-bar bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>

+ 2 - 2
template/layout_topbottom_area_2_columns.html

@@ -5,12 +5,12 @@
 
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
                 __cell_2__
             </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2 bx-layout-column-thin">
-            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
                 __cell_3__
             </div>
         </div>

+ 1 - 1
template/scripts/BxBasePage.php

@@ -123,7 +123,7 @@ class BxBasePage extends BxDolPage
     	
     	
                 if ($sContentWithBox)
-                    $sCell .= '<div class="bx-page-block-container bx-def-padding-topbottom' . $sHiddenOn . '" id="bx-page-block-' . $aBlock['id'] . '">' . $sContentWithBox . '</div>';
+                    $sCell .= '<div class="bx-page-block-container bx-def-padding-sec-topbottom' . $sHiddenOn . '" id="bx-page-block-' . $aBlock['id'] . '">' . $sContentWithBox . '</div>';
             }
             $aVars[$sKey] = $sCell;
         }

+ 1 - 1
template/scripts/BxBaseSearch.php

@@ -97,7 +97,7 @@ class BxBaseSearch extends BxDolSearch
             $o->addCssJs();
         }
 
-        return '<div class="bx-page-block-container bx-def-padding-topbottom bx-clearfix">' . DesignBoxContent($sTitle, $sForm, $iDesignBoxTemplate) . '</div>';
+        return '<div class="bx-page-block-container bx-def-padding-sec-topbottom bx-clearfix">' . DesignBoxContent($sTitle, $sForm, $iDesignBoxTemplate) . '</div>';
     }
 
     public function getResultsContainer($sCode = '')

+ 1 - 1
template/scripts/BxBaseSearchResult.php

@@ -80,7 +80,7 @@ class BxBaseSearchResult extends BxDolSearchResult
         if ($this->id) {
             $sTitle = _t($this->aCurrent['title']);
         	$sCode = $this->oFunctions->designBoxContent($sTitle, $sContent, $this->iDesignBoxTemplate, $sMenu);
-            return '<div class="bx-page-block-container bx-search-results bx-def-padding-topbottom bx-clearfix" id="bx-page-block-' . $this->id . '">' . $sCode . '</div>';
+            return '<div class="bx-page-block-container bx-search-results bx-def-padding-sec-topbottom bx-clearfix" id="bx-page-block-' . $this->id . '">' . $sCode . '</div>';
         }
 
         $this->addPageRssLink ();