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

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

Browse source
This commit is contained in:
Tom Hughes 2023-10-25 18:19:57 +01:00
commit 8daaab2aa8
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/index.js
View file

@ -175,8 +175,7 @@ $(document).ready(function () {
}
}
var placement = $("html").attr("dir") === "rtl" ? "right" : "left";
$(".leaflet-control .control-button").tooltip({ placement: placement, container: "body" });
$(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });
var expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);

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

@ -2,6 +2,34 @@
@import "bootstrap";
@import "rails_bootstrap_forms";
/* Bootstrap + r2 fixes */
:root[dir=rtl] {
.bs-tooltip-auto[data-popper-placement^="right"] .tooltip-arrow {
/* no-r2 */
right: unset !important;
left: calc(-1 * var(--bs-tooltip-arrow-height)) !important;
&::before {
/* no-r2 */
left: unset !important;
right: -1px !important;
}
}
.bs-tooltip-auto[data-popper-placement^="left"] .tooltip-arrow {
/* no-r2 */
left: unset !important;
right: calc(-1 * var(--bs-tooltip-arrow-height)) !important;
&::before {
/* no-r2 */
right: unset !important;
left: -1px !important;
}
}
}
/* Styles common to large and small screens */
/* Default rules for the body of every page */