diff --git a/themes/finc/scss/compiled.scss b/themes/finc/scss/compiled.scss
index 4002602036c026a1ebbed2c644858620fd086f39..7fb9740f1dfc0104a1136b5a2d1c9055416acdb3 100644
--- a/themes/finc/scss/compiled.scss
+++ b/themes/finc/scss/compiled.scss
@@ -1324,7 +1324,7 @@ header,
@media (min-width: $screen-sm-min) {
// position to the right!
order: 3;
- padding-top: .5em;
+ padding-top: 6px;
}
// Make smaller to fit searchbox and right-hand nav-elements
@@ -1368,6 +1368,13 @@ header,
.navbar-brand {
float: left;
padding: ($grid-gutter-width / 4) ($grid-gutter-width / 2) ($grid-gutter-width / 4) 0;
+
+ img {
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ height: $navigation-element-default-height;
+ max-width: inherit;
+ }
+ }
&:hover {
@include outline(1px);
@@ -1377,6 +1384,10 @@ header,
@media (max-width: $screen-xs-max) {
height: auto;
}
+
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ padding-right: ($grid-gutter-width / 4);
+ }
}
//// Menu toggler for small
@@ -1439,6 +1450,7 @@ header,
input {
flex-grow: 2;
flex-shrink: 2;
+ max-width: 43%;
}
.navbar {
@@ -1454,6 +1466,28 @@ header,
}
}
+ @media only screen and (max-width: $screen-xs-max) {
+ .searchForm_lookfor {
+ max-width: 80%;
+ }
+ }
+
+ @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ flex: content;
+
+ .btn,
+ .form-control {
+ float: left;
+ }
+
+ .searchForm {
+ display: block;
+
+ .checkbox {
+ position: static;
+ }
+ }
+ }
}
//// this will get search box and buttons in line
@@ -1553,7 +1587,7 @@ header,
margin: 0;
padding: 0;
- li {
+ a {
border-top: 0;
display: inline;
padding-left: .5em;
@@ -1565,7 +1599,7 @@ header,
// 786px and above as inline list
@media only screen and (min-width: $screen-sm-min) {
- li {
+ a {
border-bottom: 0;
border-right: 1px solid $brand-primary;
display: inline;
diff --git a/themes/finc/templates/search/searchbox.phtml b/themes/finc/templates/search/searchbox.phtml
index 33b1f02eab462b2d11d361236fd4347a887886b2..65f67b3019798d98b1547c5a727e735da9afb250 100644
--- a/themes/finc/templates/search/searchbox.phtml
+++ b/themes/finc/templates/search/searchbox.phtml
@@ -36,12 +36,11 @@ $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->s
<?php if (!empty($tabs)): ?><?=$tabs?>
<div class="tab-content clearfix no-gutter-all"><?php endif; ?>
<p class="adv_search_terms"><?=$this->transEsc("Your search terms")?> : "<strong><?=$this->escapeHtml($this->lookfor)?></strong>"</p>
- <?php /* finc: we use an ul li list, CK */ ?>
- <ul class="adv_search_links">
- <li><a href="<?=$this->url($advSearch)?>?edit=<?=$this->escapeHtmlAttr($this->searchId)?>"><?=$this->transEsc("Edit this Advanced Search")?></a></li>
- <li><a href="<?=$this->url($advSearch) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Advanced Search")?></a></li>
- <li><a href="<?=$this->url($searchHome) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Basic Search")?></a></li>
- </ul>
+ <p class="adv_search_links">
+ <a href="<?=$this->url($advSearch)?>?edit=<?=$this->escapeHtmlAttr($this->searchId)?>"><?=$this->transEsc("Edit this Advanced Search")?></a>
+ <a href="<?=$this->url($advSearch) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Advanced Search")?></a>
+ <a href="<?=$this->url($searchHome) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Basic Search")?></a>
+ </p>
<?php if (!empty($tabs)): ?></div><?php endif; ?>
</div>
<?php else: ?>
@@ -50,33 +49,22 @@ $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->s
<?php $placeholder = $this->searchbox()->getPlaceholderText($tabConfig['selected']['id'] ?? null); ?>
<?php /* finc: keep "required" */ ?>
<input id="searchForm_lookfor" class="searchForm_lookfor form-control search-query<?php if($this->searchbox()->autocompleteEnabled($this->searchClassId)):?> autocomplete searcher:<?=$this->escapeHtmlAttr($this->searchClassId) ?><?=$this->searchbox()->autocompleteAutoSubmit($this->searchClassId) ? ' ac-auto-submit' : '' ?><?php endif ?>" type="text" name="lookfor" value="<?=$this->escapeHtmlAttr($this->lookfor)?>"<?php if ($placeholder): ?> placeholder="<?=$this->transEsc($placeholder) ?>"<?php endif ?> aria-label="<?=$this->transEsc("search_terms")?>" required="required" />
- <?php /* finc: We use a list here, CK */ ?>
- <ul class="navbar-left list-unstyled">
- <?php if ($handlerCount > 1): ?>
- <li class="hidden-xs">
- <select id="searchForm_type" class="searchForm_type form-control" name="type" data-native-menu="false" aria-label="<?=$this->transEsc("Search type")?>">
- <?php foreach ($handlers as $handler): ?>
- <option value="<?=$this->escapeHtmlAttr($handler['value'])?>"<?=$handler['selected'] ? ' selected="selected"' : ''?>><?=$handler['indent'] ? '-- ' : ''?><?=$this->transEsc($handler['label'])?></option>
- <?php endforeach; ?>
- </select>
- </li>
- <?php elseif ($handlerCount == 1): ?>
- <input type="hidden" name="type" value="<?=$this->escapeHtmlAttr($handlers[0]['value'])?>"/>
- <?php endif; ?>
- <li>
- <button type="submit" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i> <span class="find-label sr-only"><?=$this->transEsc("Find")?></span></button>
- </li>
- <?php if ($advSearch): ?>
- <li>
- <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : $hiddenFilterParams)?>" class="btn btn-transparent" role="button" rel="nofollow"><i class="fa fa-cog"></i> <span class="hidden-xs hidden-sm hidden-md"><?=$this->transEsc("Advanced")?></span></a>
- </li>
- <?php endif; ?>
- <li>
- <?php if ($geoUrl = $this->geocoords()->getSearchUrl($options)) : ?>
- <a href="<?=$geoUrl?>" class="btn btn-link"><?=$this->transEsc('Geographic Search')?></a>
- <?php endif; ?>
- </li>
- </ul>
+ <?php if ($handlerCount > 1): ?>
+ <select id="searchForm_type" class="searchForm_type form-control hidden-xs" name="type" data-native-menu="false" aria-label="<?=$this->transEsc("Search type")?>">
+ <?php foreach ($handlers as $handler): ?>
+ <option value="<?=$this->escapeHtmlAttr($handler['value'])?>"<?=$handler['selected'] ? ' selected="selected"' : ''?>><?=$handler['indent'] ? '-- ' : ''?><?=$this->transEsc($handler['label'])?></option>
+ <?php endforeach; ?>
+ </select>
+ <?php elseif ($handlerCount == 1): ?>
+ <input type="hidden" name="type" value="<?=$this->escapeHtmlAttr($handlers[0]['value'])?>"/>
+ <?php endif; ?>
+ <button type="submit" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i> <span class="find-label sr-only"><?=$this->transEsc("Find")?></span></button>
+ <?php if ($advSearch): ?>
+ <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : $hiddenFilterParams)?>" class="btn btn-transparent" role="button" rel="nofollow"><i class="fa fa-cog"></i> <span class="hidden-xs hidden-sm hidden-md"><?=$this->transEsc("Advanced")?></span></a>
+ <?php endif; ?>
+ <?php if ($geoUrl = $this->geocoords()->getSearchUrl($options)) : ?>
+ <a href="<?=$geoUrl?>" class="btn btn-link"><?=$this->transEsc('Geographic Search')?></a>
+ <?php endif; ?>
<?php /* finc: We hide this for small and keep the solution using labels, same below - CK */ ?>
<div class="checkbox hidden-xs">