Skip to content

Commit 6befcc9

Browse files
committed
Merge remote-tracking branch 'upstream/pull/6738'
2 parents 87698df + 7c155c8 commit 6befcc9

File tree

12 files changed

+35
-113
lines changed

12 files changed

+35
-113
lines changed

app/assets/images/share_button_icons/bluesky.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/assets/images/share_button_icons/email.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/assets/images/share_button_icons/facebook.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/assets/images/share_button_icons/linkedin.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/assets/images/share_button_icons/mastodon.svg

Lines changed: 0 additions & 5 deletions
This file was deleted.

app/assets/images/share_button_icons/share.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/images/share_button_icons/telegram.svg

Lines changed: 0 additions & 16 deletions
This file was deleted.

app/assets/images/share_button_icons/x.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/assets/javascripts/share_buttons.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ $(function () {
1717

1818
if (navigator.share) {
1919
$("[data-share-type='native']").prop("hidden", false).on("click", function () {
20-
navigator.share({
21-
text: this.dataset.shareText,
22-
url: this.dataset.shareUrl
23-
});
20+
navigator.share(Object.fromEntries(new URLSearchParams(this.hash.slice(1))));
2421
});
2522
}
2623
});

app/assets/stylesheets/common.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,12 @@ legend {
517517
@include button-outline-variant($secondary, $color-hover: $white, $active-color: $white);
518518
}
519519

520+
@each $variant, $color in (bluesky: #1185fe, email: #0971BD, facebook: #3B5998, linkedin: #0077B5, mastodon: #2b90d9, telegram: #54a9eb, x: #000000) {
521+
.btn-#{$variant} {
522+
@include button-variant($color, $color, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
523+
}
524+
}
525+
520526
/* Rules for the search and direction forms */
521527

522528
.directions_form {

0 commit comments

Comments
 (0)