#1065

modules/base/general/classes/BxBaseModGeneralSearchResult.php

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

modules/base/profile/classes/BxBaseModProfileSearchResult.php

@@ -25,7 +25,7 @@ class BxBaseModProfileSearchResult extends BxBaseModGeneralSearchResult
         $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->removeContainerClass ('bx-def-margin-sec-bottom-2neg');			
+			$this->removeContainerClass ('bx-def-margin-bottom-neg');			
         }
     }
 

modules/base/text/classes/BxBaseModTextSearchResult.php

@@ -26,9 +26,9 @@ class BxBaseModTextSearchResult extends BxBaseModGeneralSearchResult
         $this->sUnitTemplate = $this->aUnitViews[$this->sUnitViewDefault];
         if (isset($this->aUnitViews[bx_get($this->sUnitViewParamName)]))
             $this->sUnitTemplate = $this->aUnitViews[bx_get($this->sUnitViewParamName)];
-		$this->addContainerClass ('bx-def-margin-sec-bottom-2neg');
+		$this->addContainerClass ('bx-def-margin-bottom-neg');
         if ('unit_gallery.html' == $this->sUnitTemplate){
-			$this->removeContainerClass ('bx-def-margin-sec-bottom-2neg');		
+			$this->removeContainerClass ('bx-def-margin-bottom-neg');		
             $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){

template/css/default.less

@@ -60,6 +60,9 @@
 .bx-def-margin-bottom {
     .margin-bottom(@bx-margin);
 }
+.bx-def-margin-bottom-neg {
+    .margin-bottom(-@bx-margin);
+}
 .bx-def-margin-left {
     .margin-left(@bx-margin);
 }
@@ -92,15 +95,9 @@
     .margin-top(-@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 {
     .margin-right(@bx-margin-sec);
     .margin-bottom(@bx-margin-sec);
@@ -121,9 +118,6 @@
 .bx-def-margin-sec-top {
     .margin-top(@bx-margin-sec);
 }
-.bx-def-margin-sec-2top {
-    .margin-top(2*@bx-margin-sec);
-}
 .bx-def-margin-sec-top-auto {
     .margin-top(@bx-margin-sec);
     &:first-child {