RomanL 8 лет назад
Родитель
Сommit
aaa8261cc8

+ 1 - 1
modules/base/general/classes/BxBaseModGeneralSearchResult.php

@@ -81,7 +81,7 @@ class BxBaseModGeneralSearchResult extends BxTemplSearchResult
         if ($this->bShowcaseView)
         if ($this->bShowcaseView)
             return '';
             return '';
         else
         else
-            return parent::showPagination ($bAdmin, $bChangePage, $bPageReload);
+            return '<div class="bx-def-margin-sec-2top">' . parent::showPagination ($bAdmin, $bChangePage, $bPageReload) . '</div>';
     }
     }
     
     
     function displayResultBlock ()
     function displayResultBlock ()

+ 4 - 5
modules/base/profile/classes/BxBaseModProfileSearchResult.php

@@ -21,13 +21,12 @@ class BxBaseModProfileSearchResult extends BxBaseModGeneralSearchResult
         if (!empty($aParams['unit_view']))
         if (!empty($aParams['unit_view']))
             $this->sUnitViewDefault = $aParams['unit_view'];
             $this->sUnitViewDefault = $aParams['unit_view'];
         $this->sUnitTemplate = $this->aUnitViews[$this->sUnitViewDefault];
         $this->sUnitTemplate = $this->aUnitViews[$this->sUnitViewDefault];
-        
-        if ('unit_with_cover_showcase.html' == $this->sUnitTemplate){
+        $this->sCenterContentUnitSelector = '.bx-base-pofile-unit';
+        $this->addContainerClass (array('bx-def-margin-sec-lefttopright-neg', 'bx-base-pofile-units-wrapper', 'bx-def-margin-sec-bottom-neg'));
+		if ('unit_with_cover_showcase.html' == $this->sUnitTemplate){
 			$this->bShowcaseView = true;
 			$this->bShowcaseView = true;
+			$this->removeContainerClass ('bx-def-margin-sec-bottom-2neg');			
         }
         }
-        
-        $this->sCenterContentUnitSelector = '.bx-base-pofile-unit';
-        $this->addContainerClass (array('bx-def-margin-sec-lefttopright-neg', 'bx-base-pofile-units-wrapper'));
     }
     }
 
 
     protected function _setConnectionsConditions ($aParams)
     protected function _setConnectionsConditions ($aParams)

+ 5 - 3
modules/base/text/classes/BxBaseModTextSearchResult.php

@@ -26,9 +26,11 @@ class BxBaseModTextSearchResult extends BxBaseModGeneralSearchResult
         $this->sUnitTemplate = $this->aUnitViews[$this->sUnitViewDefault];
         $this->sUnitTemplate = $this->aUnitViews[$this->sUnitViewDefault];
         if (isset($this->aUnitViews[bx_get($this->sUnitViewParamName)]))
         if (isset($this->aUnitViews[bx_get($this->sUnitViewParamName)]))
             $this->sUnitTemplate = $this->aUnitViews[bx_get($this->sUnitViewParamName)];
             $this->sUnitTemplate = $this->aUnitViews[bx_get($this->sUnitViewParamName)];
-
-        if ('unit_gallery.html' == $this->sUnitTemplate)
-            $this->addContainerClass (array('bx-def-margin-sec-lefttopright-neg', 'bx-base-text-unit-gallery-wrapper'));
+		$this->addContainerClass ('bx-def-margin-sec-bottom-2neg');
+        if ('unit_gallery.html' == $this->sUnitTemplate){
+			$this->removeContainerClass ('bx-def-margin-sec-bottom-2neg');		
+            $this->addContainerClass (array('bx-def-margin-sec-lefttopright-neg', 'bx-base-text-unit-gallery-wrapper bx-def-margin-sec-bottom-neg'));
+		}
 		if ('unit_showcase.html' == $this->sUnitTemplate){
 		if ('unit_showcase.html' == $this->sUnitTemplate){
 			$this->bShowcaseView = true;
 			$this->bShowcaseView = true;
 		}
 		}

+ 0 - 3
modules/base/text/template/css/main.css

@@ -136,7 +136,6 @@ div.bx-base-text-breadcrumb i {
     flex-pack: start;
     flex-pack: start;
     -webkit-justify-content: flex-start;
     -webkit-justify-content: flex-start;
     justify-content: flex-start;
     justify-content: flex-start;
-    margin-bottom: 10px;
 }
 }
 
 
 .bx-base-text-unit-gallery-wrapper .bx-base-text-unit-gallery {
 .bx-base-text-unit-gallery-wrapper .bx-base-text-unit-gallery {
@@ -166,8 +165,6 @@ div.bx-base-text-breadcrumb i {
 	{
 	{
 	   width:calc(50%);
 	   width:calc(50%);
 	}
 	}
-
-    
 }
 }
 
 
 @media (min-width:533px) and (max-width:1024px) {
 @media (min-width:533px) and (max-width:1024px) {

+ 12 - 0
template/css/default.less

@@ -92,6 +92,15 @@
     .margin-top(-@bx-margin-sec);
     .margin-top(-@bx-margin-sec);
     .margin-right(-@bx-margin-sec);
     .margin-right(-@bx-margin-sec);
 }
 }
+.bx-def-margin-sec-top-neg {
+    .margin-top(-2*@bx-margin-sec);
+}
+.bx-def-margin-sec-bottom-neg {
+    .margin-bottom(-@bx-margin-sec);
+}
+.bx-def-margin-sec-bottom-2neg {
+    .margin-bottom(-2*@bx-margin-sec);
+}
 .bx-def-margin-sec-rightbottomleft {
 .bx-def-margin-sec-rightbottomleft {
     .margin-right(@bx-margin-sec);
     .margin-right(@bx-margin-sec);
     .margin-bottom(@bx-margin-sec);
     .margin-bottom(@bx-margin-sec);
@@ -112,6 +121,9 @@
 .bx-def-margin-sec-top {
 .bx-def-margin-sec-top {
     .margin-top(@bx-margin-sec);
     .margin-top(@bx-margin-sec);
 }
 }
+.bx-def-margin-sec-2top {
+    .margin-top(2*@bx-margin-sec);
+}
 .bx-def-margin-sec-top-auto {
 .bx-def-margin-sec-top-auto {
     .margin-top(@bx-margin-sec);
     .margin-top(@bx-margin-sec);
     &:first-child {
     &:first-child {