cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/4266'

Browse source
This commit is contained in:
Tom Hughes 2023-10-02 18:47:21 +01:00
commit 0d420a8374
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/common.scss
View file

@ -143,7 +143,7 @@ header {
nav.primary {
.btn-outline-primary {
& > .btn-group .btn-outline-primary {
@include button-outline-variant($green, $color-hover: $white, $active-color: $white);
}
@ -1055,11 +1055,12 @@ tr.turn:hover {
.search_form {
background-color: $lightgrey;
#query {
z-index: 0;
}
.describe_location {
top: 6px;
right: 6px;
font-size: 10px;
color: $blue;
}
}

12
app/views/layouts/_search.html.erb
View file

@ -2,12 +2,12 @@
<form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
<div class="row gx-2 mx-0">
<div class="col">
<div class="d-flex">
<span class='position-relative flex-grow-1'>
<%= link_to t("site.search.where_am_i"), "#", :class => "describe_location position-absolute", :title => t("site.search.where_am_i_title") %>
<%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm rounded-0 rounded-start border-end-0", :dir => "auto" %>
</span>
<%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary rounded-0 rounded-end", :data => { :disable_with => false } %>
<div class="input-group flex-nowrap">
<%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
<div class="input-group-text border-start-0 p-0 position-relative">
<%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 me-1 btn btn-sm btn-outline-primary border-0 bg-transparent", :title => t("site.search.where_am_i_title") %>
</div>
<%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
</div>
</div>
<div class="col-auto">