Просмотр исходного кода

#28 - Design boxes and page layouts update.

AntonLV 13 лет назад
Родитель
Сommit
c387493e90

+ 1 - 1
studio/template/bp_cell.html

@@ -1,4 +1,4 @@
-<div class="adm-bp-cell bx-def-margin-bottom bx-def-border">
+<div class="adm-bp-cell bx-def-margin-topbottom bx-def-border">
     <div id="adm-bpc-__id__" class="adm-bp-cell-cnt">
     <div id="adm-bpc-__id__" class="adm-bp-cell-cnt">
         <bx_include_auto:bp_blocks.html />
         <bx_include_auto:bp_blocks.html />
     </div>
     </div>

+ 1 - 1
template/_sub_footer.html

@@ -15,7 +15,7 @@
 
 
 <hr class="bx-def-hr" />
 <hr class="bx-def-hr" />
 
 
-<div class="bx-page-wrapper bx-def-page-width">
+<div class="bx-page-wrapper bx-def-padding-sec-left bx-def-padding-sec-right bx-def-page-width">
 
 
     <div id="bx-footer" class="bx-def-padding-sec-left bx-def-padding-sec-right">
     <div id="bx-footer" class="bx-def-padding-sec-left bx-def-padding-sec-right">
 
 

+ 2 - 2
template/_sub_header.html

@@ -46,7 +46,7 @@
 
 
     <div id="bx-menu-main-bar" class="bx-def-color-bg-sec">
     <div id="bx-menu-main-bar" class="bx-def-color-bg-sec">
 
 
-        <div class="bx-page-wrapper bx-def-page-width">
+        <div class="bx-page-wrapper bx-def-padding-sec-left bx-def-padding-sec-right bx-def-page-width">
 
 
             <bx_injection:injection_top_menu_before />
             <bx_injection:injection_top_menu_before />
 
 
@@ -70,7 +70,7 @@
 __informer__
 __informer__
 
 
 
 
-<div class="bx-page-wrapper bx-def-page-width">
+<div class="bx-page-wrapper bx-def-padding-sec-left bx-def-padding-sec-right bx-def-page-width">
 
 
     <div id="bx-content-container" class="bx-def-padding-sec-left bx-def-padding-sec-right">
     <div id="bx-content-container" class="bx-def-padding-sec-left bx-def-padding-sec-right">
 
 

+ 0 - 1
template/css/menu.css

@@ -172,7 +172,6 @@ ul.bx-menu-main {
 .bx-menu-main li .sys-icon,
 .bx-menu-main li .sys-icon,
 .bx-menu-main-submenu li a {
 .bx-menu-main-submenu li a {
     text-decoration:none;
     text-decoration:none;
-    font-weight:300;
     font-size:16px;
     font-size:16px;
     font-size:1.2rem;
     font-size:1.2rem;
 }
 }

+ 5 - 5
template/designbox_0.html

@@ -1,5 +1,5 @@
-
-<!-- Design Box 0 [start] -->
-__designbox_content__
-<!-- Design Box 0 [ end ] -->
-
+<!-- Design Box 0 [start]: Content only -->
+<div class="bx-db-content bx-clearfix">
+	__designbox_content__
+</div>
+<!-- Design Box 0 [ end ] -->

+ 4 - 6
template/designbox_1.html

@@ -1,10 +1,8 @@
-
-<!-- Design Box 1 [start] -->
-<div class="bx-db-container bx-def-margin-bottom">
+<!-- Design Box 1 [start]: Content + title + background -->
+<div class="bx-db-container">
     <div class="bx-db-header"><div class="bx-db-title bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
     <div class="bx-db-header"><div class="bx-db-title bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
-    <hr class="bx-def-hr" />
+    <div class="bx-def-hr"></div>
     <div class="bx-db-content bx-clearfix">__designbox_content__</div>
     <div class="bx-db-content bx-clearfix">__designbox_content__</div>
     __bottom_item__
     __bottom_item__
 </div>
 </div>
-<!-- Design Box 1 [ end ] -->
-
+<!-- Design Box 1 [ end ] -->

+ 3 - 5
template/designbox_10.html

@@ -1,7 +1,5 @@
-
-<!-- Design Box 10 [start] -->
-<div class="bx-def-margin-bottom bx-clearfix">
+<!-- Design Box 10 [start]: Content only + padding -->
+<div class="bx-db-content bx-clearfix bx-def-padding-top">
     __designbox_content__
     __designbox_content__
 </div>
 </div>
-<!-- Design Box 10 [ end ] -->
-
+<!-- Design Box 10 [ end ] -->

+ 5 - 7
template/designbox_11.html

@@ -1,10 +1,8 @@
-
-<!-- Design Box 11 [start] -->
-<div class="bx-db-container bx-def-margin-bottom">
+<!-- Design Box 11 [start]: Content + title + background + padding -->
+<div class="bx-db-container">
     <div class="bx-db-header"><div class="bx-db-title bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
     <div class="bx-db-header"><div class="bx-db-title bx-def-font-h2">__title__</div>__caption_item__<div class="bx-clear"></div></div>
-    <hr class="bx-def-hr bx-def-margin-bottom" />
-    <div class="bx-db-content bx-clearfix">__designbox_content__</div>
+    <div class="bx-def-hr"></div>
+    <div class="bx-db-content bx-def-padding-top bx-clearfix">__designbox_content__</div>
     __bottom_item__
     __bottom_item__
 </div>
 </div>
-<!-- Design Box 11 [ end ] -->
-
+<!-- Design Box 11 [ end ] -->

+ 4 - 6
template/designbox_13.html

@@ -1,9 +1,7 @@
-
-<!-- Design Box 13 [start] -->
-<div class="bx-db-container bx-def-margin-bottom">
-    <div class="bx-db-content bx-clearfix">
+<!-- Design Box 13 [start]: Content + background + padding -->
+<div class="bx-db-container">
+    <div class="bx-db-content bx-clearfix bx-def-padding-top">
             __designbox_content__
             __designbox_content__
     </div>
     </div>
 </div>
 </div>
-<!-- Design Box 13 [ end ] -->
-
+<!-- Design Box 13 [ end ] -->

+ 3 - 5
template/designbox_3.html

@@ -1,9 +1,7 @@
-
-<!-- Design Box 3 [start] -->
-<div class="bx-db-container bx-def-margin-bottom">
+<!-- Design Box 3 [start]: Content + background -->
+<div class="bx-db-container">
     <div class="bx-db-content bx-clearfix">
     <div class="bx-db-content bx-clearfix">
             __designbox_content__
             __designbox_content__
     </div>
     </div>
 </div>
 </div>
-<!-- Design Box 3 [ end ] -->
-
+<!-- Design Box 3 [ end ] -->

+ 2 - 2
template/layout_2_columns.html

@@ -2,12 +2,12 @@
 <div class="bx-layout-wrapper bx-layout-2-columns">
 <div class="bx-layout-wrapper bx-layout-2-columns">
     <div class="bx-layout-row bx-clearfix">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1">
         <div class="bx-layout-col bx-layout-2-columns-column1">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
                 __cell_1__
                 __cell_1__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2">
         <div class="bx-layout-col bx-layout-2-columns-column2">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </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-wrapper bx-layout-3-columns">
     <div class="bx-layout-row bx-clearfix">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1">
         <div class="bx-layout-col bx-layout-3-columns-column1">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
                 __cell_1__
                 __cell_1__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column2">
         <div class="bx-layout-col bx-layout-3-columns-column2">
-            <div class="bx-layout-cell bx-def-padding-sec-right bx-def-padding-sec-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-leftright" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column3">
         <div class="bx-layout-col bx-layout-3-columns-column3">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </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-wrapper bx-layout-bar-left">
     <div class="bx-layout-row bx-clearfix">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar">
         <div class="bx-layout-col bx-layout-bar-left-bar">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
                 __cell_1__
                 __cell_1__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-left-content">
         <div class="bx-layout-col bx-layout-bar-left-content">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </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-wrapper bx-layout-bar-right">
     <div class="bx-layout-row bx-clearfix">
     <div class="bx-layout-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content">
         <div class="bx-layout-col bx-layout-bar-right-content">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-1">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-1">
                 __cell_1__
                 __cell_1__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-right-bar">
         <div class="bx-layout-col bx-layout-bar-right-bar">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </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-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1">
         <div class="bx-layout-col bx-layout-2-columns-column1">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2">
         <div class="bx-layout-col bx-layout-2-columns-column2">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </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-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1">
         <div class="bx-layout-col bx-layout-2-columns-column1">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2">
         <div class="bx-layout-col bx-layout-2-columns-column2">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </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-row bx-clearfix">
         <div class="bx-layout-col bx-layout-3-columns-column1">
         <div class="bx-layout-col bx-layout-3-columns-column1">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column2">
         <div class="bx-layout-col bx-layout-3-columns-column2">
-            <div class="bx-layout-cell bx-def-padding-sec-right bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-leftright" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-3-columns-column3">
         <div class="bx-layout-col bx-layout-3-columns-column3">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-4">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-4">
                 __cell_4__
                 __cell_4__
             </div>
             </div>
         </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-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-left-bar">
         <div class="bx-layout-col bx-layout-bar-left-bar">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-left-content">
         <div class="bx-layout-col bx-layout-bar-left-content">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </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-row bx-clearfix">
         <div class="bx-layout-col bx-layout-bar-right-content">
         <div class="bx-layout-col bx-layout-bar-right-content">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-bar-right-bar">
         <div class="bx-layout-col bx-layout-bar-right-bar">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </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-row bx-clearfix">
         <div class="bx-layout-col bx-layout-2-columns-column1">
         <div class="bx-layout-col bx-layout-2-columns-column1">
-            <div class="bx-layout-cell bx-def-padding-sec-right" id="bx-layout-cell-2">
+            <div class="bx-layout-cell bx-def-padding-right" id="bx-layout-cell-2">
                 __cell_2__
                 __cell_2__
             </div>
             </div>
         </div>
         </div>
         <div class="bx-layout-col bx-layout-2-columns-column2">
         <div class="bx-layout-col bx-layout-2-columns-column2">
-            <div class="bx-layout-cell bx-def-padding-sec-left" id="bx-layout-cell-3">
+            <div class="bx-layout-cell bx-def-padding-left" id="bx-layout-cell-3">
                 __cell_3__
                 __cell_3__
             </div>
             </div>
         </div>
         </div>

+ 1 - 1
template/scripts/BxBasePage.php

@@ -94,7 +94,7 @@ class BxBasePage extends BxDolPage {
             foreach ($aCell as $aBlock) {
             foreach ($aCell as $aBlock) {
                 $sContentWithBox = $this->_getBlockCode($aBlock);
                 $sContentWithBox = $this->_getBlockCode($aBlock);
                 if ($sContentWithBox)
                 if ($sContentWithBox)
-                    $sCell .= '<div class="bx-page-block-container" id="bx-page-block-' . $aBlock['id'] . '">' . $sContentWithBox . '</div>';
+                    $sCell .= '<div class="bx-page-block-container bx-def-padding-topbottom" id="bx-page-block-' . $aBlock['id'] . '">' . $sContentWithBox . '</div>';
             }
             }
             $aVars[$sKey] = $sCell;
             $aVars[$sKey] = $sCell;
         }
         }