Merge branch 'instance/fid' into instance/fid_adlr

themes/finc/scss/_customVariables.scss

@@ -10,7 +10,7 @@
 // Import parent theme variables to have them all available here
 // @import '../../bootstrap3/scss/vendor/bootstrap/variables';
 @import '../../bootstrap3/scss/vendor/font-awesome/variables';
-
+@import 'components/functions';
 @import 'customFonts';
 
 

themes/finc/scss/components/_result-list.scss

@@ -8,7 +8,8 @@
 // *****************************************************************
 
 // re-define header for records in list of result, #19396
-header {
+.record header,
+.result header {
   background-color: transparent;
   width: auto;
 }

themes/finc/scss/finc.scss

@@ -6,7 +6,6 @@
 // *****************************************************************
 
 // Make sure imports are grouped correctly so variables can be loaded!
-@import 'components/functions';
 @import 'customVariables';
 
 // Import Bootstrap here

themes/finc/templates/search/searchbox.phtml

@@ -29,8 +29,7 @@
     $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?');
     
     /* finc: Don't load active filters here but above search results
-     * uncommend following block and upcoming linked filter templates for displaying filter in header */
-    /*
+     * reuse following php block and uncommend upcoming linked filter templates for displaying filter in header */
     if (!isset($this->filterList) || !isset($this->checkboxFilters)) {
         $params = $this->searchMemory()->getLastSearchParams($this->searchClassId);
         $filterList = $params->getFilterList(true);
@@ -41,7 +40,6 @@
     }
     $filterDetails = $this->searchbox()->getFilterDetails($filterList, $checkboxFilters);
     $showFilters = $filterDetails && (isset($results) || $options->getRetainFilterSetting());
-    */
 ?>
 <?php $tabConfig = $this->searchTabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?>
 <?php if ($this->searchType == 'advanced'): ?>