Commit 693cdda5229f450f7eb908d952e39bb0119ba4bb
1 parent
bc15e931
Exists in
master
and in
29 other branches
Adjusting display_selector
Showing
4 changed files
with
19 additions
and
12 deletions
Show diff stats
plugins/solr/public/style.css
... | ... | @@ -4,11 +4,18 @@ |
4 | 4 | } |
5 | 5 | |
6 | 6 | #search-column-right .search-customize-options { |
7 | - float: left; | |
8 | - margin-top: 23px; | |
9 | - margin-left: 0; | |
7 | + position: absolute; | |
8 | + margin: 0; | |
9 | + padding: 5px 0; | |
10 | + bottom: 0; | |
11 | + left: 0; | |
10 | 12 | } |
11 | 13 | |
12 | 14 | #search-column-right .search-results-box .vcard { |
13 | 15 | margin: 4.5px 8px; |
14 | 16 | } |
17 | + | |
18 | +#search-column-right #search-actions { | |
19 | + position: relative; | |
20 | + height: 45px; | |
21 | +} | ... | ... |
plugins/solr/views/search/_facets_unselect_menu.rhtml
plugins/solr/views/search/_results_header.html.erb
... | ... | @@ -9,14 +9,14 @@ |
9 | 9 | <% end %> |
10 | 10 | </div> |
11 | 11 | |
12 | - <div class="search-results-header-facets-order-by"> | |
13 | - <%= facets_unselect_menu(@asset) %> | |
14 | - <%= order_by(@asset) if params[:display] != 'map' %> | |
15 | - </div> | |
12 | + <%= facets_unselect_menu(@asset) %> | |
16 | 13 | <% else %> |
17 | 14 | <div id='search-filter-title'><%= filter_title(@asset, @filter) %></div> |
18 | 15 | <% end %> |
19 | - <%= display_selector(@asset, params[:display]) %> | |
20 | - <%= filter_selector(@asset, @filter) if @empty_query && params[:display] != 'map' %> | |
16 | + <div id="search-actions"> | |
17 | + <%= order_by(@asset) if params[:display] != 'map' && !@empty_query %> | |
18 | + <%= display_selector(@asset, params[:display]) %> | |
19 | + <%= filter_selector(@asset, @filter) if @empty_query && params[:display] != 'map' %> | |
20 | + </div> | |
21 | 21 | <div style="clear: both"></div> |
22 | 22 | </div> | ... | ... |
public/stylesheets/search.css
... | ... | @@ -466,15 +466,14 @@ li.search-product-item { |
466 | 466 | position: relative; |
467 | 467 | } |
468 | 468 | .facets-applied { |
469 | - float: left; | |
470 | 469 | padding: 5px 0px 0px 0px; |
471 | - width: 80%; | |
472 | 470 | } |
473 | 471 | .facets-applied-label { |
474 | 472 | display: block; |
475 | 473 | font-size: 1em; |
476 | 474 | font-style: italic; |
477 | 475 | padding: 0 0 5px 0; |
476 | + text-align: left; | |
478 | 477 | } |
479 | 478 | .facet-selected { |
480 | 479 | display: block; |
... | ... | @@ -683,7 +682,7 @@ li.search-product-item hr { |
683 | 682 | .search-customize-options { |
684 | 683 | display: inline-block; |
685 | 684 | margin-left: 8px; |
686 | - margin-top: 10px; | |
685 | + margin-top: 20px; | |
687 | 686 | } |
688 | 687 | |
689 | 688 | /* Search field and button */ | ... | ... |