Merge remote-tracking branch 'upstream/pull/3109'
This commit is contained in:
Tom Hughes
commit
8b9164644b
2 changed files with 61 additions and 341 deletions
|
|
@ -783,8 +783,8 @@ tr.turn {
|
|||
tr.turn:hover {
|
||||
background: $list-highlight;
|
||||
}
|
||||
.routing_engines, #route_from, #route_to { margin-left: 25px; }
|
||||
.routing_marker { width: 15px; position: absolute; cursor: move; }
|
||||
|
||||
.routing_marker { width: 15px; cursor: move; }
|
||||
|
||||
/* Rules for entity history */
|
||||
|
||||
|
|
@ -1498,252 +1498,30 @@ tr.turn:hover {
|
|||
}
|
||||
}
|
||||
|
||||
/* Rules for forms */
|
||||
.search_form {
|
||||
background-color: $lightgrey;
|
||||
|
||||
.standard-form {
|
||||
fieldset {
|
||||
margin-bottom: $lineheight;
|
||||
}
|
||||
label.standard-label {
|
||||
display: block;
|
||||
margin-bottom: $lineheight/4;
|
||||
font-size: $typeheight;
|
||||
font-weight: bold;
|
||||
line-height: 1.5;
|
||||
}
|
||||
label.standard-label.secondary {
|
||||
display: inline-block;
|
||||
font-weight: normal;
|
||||
}
|
||||
.form-help {
|
||||
font-weight: normal;
|
||||
}
|
||||
.form-column {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
.form-divider {
|
||||
margin-top: $lineheight;
|
||||
padding-top: $lineheight;
|
||||
border-top: 1px solid $lightgrey;
|
||||
}
|
||||
.horizontal-list .standard-form-row {
|
||||
float: left;
|
||||
padding-right: 10px;
|
||||
}
|
||||
.standard-form-row {
|
||||
margin-bottom: $lineheight/2;
|
||||
}
|
||||
.form-list {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.form-list li {
|
||||
margin-bottom: 5px;
|
||||
list-style-type: none;
|
||||
}
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
.describe_location {
|
||||
top: 6px;
|
||||
right: 6px;
|
||||
font-size: 10px;
|
||||
color: $blue;
|
||||
}
|
||||
}
|
||||
|
||||
#remember_me_openid {
|
||||
display: block;
|
||||
}
|
||||
.directions_form {
|
||||
background-color: $lightgrey;
|
||||
|
||||
select {
|
||||
padding: 2px;
|
||||
}
|
||||
.loader_copy {
|
||||
display: none;
|
||||
|
||||
input[type="checkbox"],
|
||||
input[type="radio"] {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
input[type="text"],
|
||||
input[type="email"],
|
||||
input[type="url"],
|
||||
input[type="password"],
|
||||
textarea {
|
||||
color: #222;
|
||||
background-color: #fff;
|
||||
border: 1px solid $grey;
|
||||
border-radius: 3px;
|
||||
padding: 2px 5px;
|
||||
margin: 0;
|
||||
width: 200px;
|
||||
|
||||
&.field_with_errors {
|
||||
border: 2px solid #ff7070;
|
||||
img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
|
||||
textarea {
|
||||
padding: 5px;
|
||||
width: 100%;
|
||||
min-height: 50px;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
|
||||
/* Utility for general button styles */
|
||||
|
||||
input[type="button"],
|
||||
input[type="submit"],
|
||||
input[type="reset"],
|
||||
a.button {
|
||||
a.reverse_directions {
|
||||
cursor: pointer;
|
||||
border: 0;
|
||||
display: inline-block;
|
||||
padding: $lineheight/4 $lineheight/2;
|
||||
min-height: 20px + $lineheight/2;
|
||||
min-width: 120px;
|
||||
margin: 0 0 $lineheight/2 0;
|
||||
color: white;
|
||||
background: $blue;
|
||||
text-align: center;
|
||||
border-radius: 2px;
|
||||
&:hover {
|
||||
background: darken($blue, $hovercolor);
|
||||
text-decoration: none;
|
||||
}
|
||||
&.deemphasize {
|
||||
background: $lightblue;
|
||||
&:hover {
|
||||
background: darken($lightblue, $hovercolor);
|
||||
}
|
||||
}
|
||||
&:disabled {
|
||||
background: $lightgrey;
|
||||
&:hover {
|
||||
background: $lightgrey;
|
||||
}
|
||||
}
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
input[type="button"],
|
||||
input[type="submit"],
|
||||
input[type="reset"] {
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
a.button {
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.search_form,
|
||||
.directions_form {
|
||||
position: relative;
|
||||
padding: $lineheight/2;
|
||||
background-color: $lightgrey;
|
||||
|
||||
.query_wrapper {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
border-radius: 2px 0 0 2px;
|
||||
}
|
||||
|
||||
input[type=text] {
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
transition: 300ms linear;
|
||||
}
|
||||
|
||||
input[type=text].overflow {
|
||||
border-right: none;
|
||||
border-radius: 3px 0px 0px 3px;
|
||||
}
|
||||
|
||||
input:focus {
|
||||
outline: none;
|
||||
box-shadow: 0px 0px 7px $vibrant-green;
|
||||
}
|
||||
|
||||
input[type=submit].float {
|
||||
float: right;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
border-radius: 0 2px 2px 0;
|
||||
}
|
||||
|
||||
input.error {
|
||||
background-color: rgba($red, 0.4);
|
||||
}
|
||||
|
||||
select {
|
||||
/* this next line is to polyfill the vertical alignment of text within a select element,
|
||||
* which is different between firefox and chrome. */
|
||||
padding: 0.3em 0;
|
||||
}
|
||||
|
||||
.query_options {
|
||||
text-align: right;
|
||||
font-size: 10px;
|
||||
color: $blue;
|
||||
}
|
||||
|
||||
.describe_location {
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 6px;
|
||||
font-size: 10px;
|
||||
color: $blue;
|
||||
}
|
||||
|
||||
.switch_link {
|
||||
float: right;
|
||||
width: auto;
|
||||
min-width: 0;
|
||||
margin-left: 6px;
|
||||
}
|
||||
|
||||
img.button {
|
||||
display: block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
span.force_width {
|
||||
width: 100%;
|
||||
padding-right: 25px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
select.routing_engines {
|
||||
min-height: 30px;
|
||||
margin: 0px 0px 5px 25px;
|
||||
}
|
||||
|
||||
input.routing_go {
|
||||
min-width: 100px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
div.header {
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
div.line {
|
||||
width: 100%;
|
||||
margin: 0px 0px 5px 0px;
|
||||
}
|
||||
|
||||
div.loader_copy {
|
||||
display: none;
|
||||
|
||||
img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
}
|
||||
|
||||
a.reverse_directions {
|
||||
cursor: pointer;
|
||||
margin: 0px 0px 5px 25px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1938,88 +1716,6 @@ div.secondary-actions {
|
|||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* Rules for rich text editors */
|
||||
|
||||
.standard-form {
|
||||
input.richtext_title[type="text"] {
|
||||
width: 50%;
|
||||
width: calc(100% - 235px);
|
||||
|
||||
@media only screen and (max-width:768px) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.richtext_container {
|
||||
margin-bottom: $lineheight;
|
||||
|
||||
.richtext_content {
|
||||
width: 50%;
|
||||
width: calc(100% - 235px);
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
|
||||
@media only screen and (max-width:768px) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.richtext_preview {
|
||||
display: inline-block;
|
||||
padding: $lineheight;
|
||||
background-color: $offwhite;
|
||||
overflow-x: auto;
|
||||
|
||||
&.loading {
|
||||
background-image: image-url("loading.gif");
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
}
|
||||
|
||||
> :first-child {
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.richtext_help {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
margin-left: 15px;
|
||||
background-color: $offwhite;
|
||||
padding: $lineheight/2;
|
||||
width: 220px;
|
||||
|
||||
ul {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
h4.heading, li {
|
||||
border-bottom: 1px solid $grey;
|
||||
margin-bottom: $lineheight/4;
|
||||
padding-bottom: $lineheight/4;
|
||||
}
|
||||
|
||||
li h4, li span, li p {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
li h4 {
|
||||
width: 40%;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
li span, li p {
|
||||
width: 50%;
|
||||
margin-left: $lineheight/2;
|
||||
margin-bottom: $lineheight/4;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Rules for the user notes list */
|
||||
|
||||
.note_list {
|
||||
|
|
|
|||
|
|
@ -1,30 +1,54 @@
|
|||
<div class="search_forms standard-form">
|
||||
<form method="GET" action="<%= search_path %>" class="search_form">
|
||||
<%= link_to image_tag("directions.png", :class => "button"), directions_path, :class => "button switch_link", :title => t("site.search.get_directions_title") %>
|
||||
<%= submit_tag t("site.search.submit_text"), :class => "float", :data => { :disable_with => false } %>
|
||||
<div class='query_wrapper'>
|
||||
<%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :class => "overflow" %>
|
||||
<%= link_to t("site.search.where_am_i"), "#", :class => "describe_location", :title => t("site.search.where_am_i_title") %>
|
||||
<div class="search_forms">
|
||||
<form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
|
||||
<div class="form-row mx-0">
|
||||
<div class="col">
|
||||
<div class="input-group">
|
||||
<div class='query_wrapper 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, :class => "form-control form-control-sm" %>
|
||||
</div>
|
||||
<div class="input-group-append">
|
||||
<%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<%= link_to image_tag("directions.png", :width => "20", :height => "20"), directions_path, :class => "btn btn-sm btn-primary switch_link", :title => t("site.search.get_directions_title") %>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<form method="GET" action="<%= directions_path %>" class="directions_form">
|
||||
<div class="header"><span class="icon close"></span></div>
|
||||
<form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
|
||||
<div class="clearfix px-3 py-3"><span class="icon close"></span></div>
|
||||
|
||||
<div class="line">
|
||||
<%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type => "from" }, :draggable => "true" %>
|
||||
<span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from") %></span>
|
||||
<div class="form-row m-1">
|
||||
<div class="col-1">
|
||||
<%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %>
|
||||
</div>
|
||||
<div class="col">
|
||||
<%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :class => "form-control form-control-sm" %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="line">
|
||||
<%= image_tag "marker-red.png", :class => "routing_marker", :data => { :type => "to" }, :draggable => "true" %>
|
||||
<span class="force_width"><%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to") %></span>
|
||||
<div class="form-row m-1">
|
||||
<div class="col-1">
|
||||
<%= image_tag "marker-red.png", :class => "routing_marker mx-auto d-block", :data => { :type => "to" }, :draggable => "true" %>
|
||||
</div>
|
||||
<div class="col">
|
||||
<%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :class => "form-control form-control-sm" %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="line">
|
||||
<select class="routing_engines" name="routing_engines"></select>
|
||||
<%= submit_tag t("site.search.submit_text"), :class => "routing_go", :data => { :disable_with => false } %>
|
||||
<div class="form-row m-1">
|
||||
<div class="col offset-1">
|
||||
<select class="routing_engines form-control form-control-sm" name="routing_engines"></select>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="line">
|
||||
<a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
|
||||
<div class="form-row m-1">
|
||||
<div class="col offset-1">
|
||||
<a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue