Skip to content

Commit

Permalink
[frontend] scroll to highlighted toot, improve highlight (#885)
Browse files Browse the repository at this point in the history
  • Loading branch information
f0x52 authored Oct 3, 2022
1 parent fe238f8 commit 1a56352
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion web/source/css/_colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ $button-danger-fg: $gray1;
$button-danger-hover-bg: $orange2;

$toot-focus-bg: $gray5;
$toot-unfocus-bg: $gray3;
$toot-unfocus-bg: $gray2;

$toot-info-bg: $gray4;

Expand Down
8 changes: 8 additions & 0 deletions web/source/frontend/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ const Photoswipe = require("photoswipe/dist/umd/photoswipe.umd.min.js");
const PhotoswipeLightbox = require("photoswipe/dist/umd/photoswipe-lightbox.umd.min.js");
const PhotoswipeCaptionPlugin = require("photoswipe-dynamic-caption-plugin").default;

let [_, _user, type, id] = window.location.pathname.split("/");
if (type == "statuses") {
let firstStatus = document.getElementsByClassName("thread")[0].children[0];
if (firstStatus.id != id) {
document.getElementById(id).scrollIntoView();
}
}

const lightbox = new PhotoswipeLightbox({
gallery: '.photoswipe-gallery',
children: 'a',
Expand Down
6 changes: 3 additions & 3 deletions web/template/thread.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<main>
<div data-nosnippet class="thread">
{{range .context.Ancestors}}
<div class="toot">
<div class="toot" id="{{.ID}}">
{{ template "status.tmpl" .}}
</div>
{{end}}
<div class="toot expanded">
<div class="toot expanded" id="{{.status.ID}}">
{{ template "status.tmpl" .status}}
</div>
{{range .context.Descendants}}
<div class="toot">
<div class="toot" id="{{.ID}}">
{{ template "status.tmpl" .}}
</div>
{{end}}
Expand Down

0 comments on commit 1a56352

Please sign in to comment.