Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UX: fixed top menu when backlink to the site exists #222

Merged
merged 1 commit into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

- 2024-02-15: 2.17.1

- UX: fixed top menu when backlink to the site exists

- 2024-02-15: 2.17.0

- FEATURE: backlink to site
Expand Down
5 changes: 5 additions & 0 deletions client-app/app/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ export default class IndexController extends Controller {
return Preload.get("back_to_site_link_path");
}

@computed
get hasTopMenu() {
return this.backToSiteLinkText && this.backToSiteLinkPath;
}

get actionsInMenu() {
return (
/mobile/i.test(navigator.userAgent) && !/iPad/.test(navigator.userAgent)
Expand Down
12 changes: 12 additions & 0 deletions client-app/app/styles/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,22 @@ tbody tr {
bottom: 320px;
overflow: auto;
}
#top-panel.with-top-menu {
top: 35px;
}

#top-menu {
position: fixed;
z-index: 900;
left: 0;
top: 0;
width: 100%;
}

#back-to-site-panel {
padding: 10px;
background-color: #f1f1f1;
height: 15px;
}

.message-info {
Expand Down
14 changes: 9 additions & 5 deletions client-app/app/templates/index.hbs
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<div id="top-panel">
<BackToSiteLink
@path={{this.backToSiteLinkPath}}
@text={{this.backToSiteLinkText}}
/>
{{#if this.hasTopMenu}}
<div id="top-menu">
<BackToSiteLink
@path={{this.backToSiteLinkPath}}
@text={{this.backToSiteLinkText}}
/>
</div>
{{/if}}
<div id="top-panel" class={{if this.hasTopMenu "with-top-menu"}}>
<div id="log-table">
{{#if this.model.moreBefore}}
<div {{on "click" this.showMoreBefore}} class="show-more">
Expand Down
2 changes: 1 addition & 1 deletion lib/logster/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Logster
VERSION = "2.17.0"
VERSION = "2.17.1"
end
Loading