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.

Sign up for GitHub

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

feature-1736: Make right sidebar on tracks.html stay on page #2673

Closed
wants to merge 4 commits into from
Closed

feature-1736: Make right sidebar on tracks.html stay on page #2673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
954d008
feature-1736: Make right sidebar on tracks.html stay on page
Aug 22, 2023
4c6840d
feature-1736: Make right sidebar on tracks.html stay on page
Aug 22, 2023
80e0416
Merge branch 'development' into lthanhhieu-tma/feature-1736
mariobehling Aug 24, 2023
14ce6c4
Merge branch 'development' into lthanhhieu-tma/feature-1736
mariobehling Aug 25, 2023
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
18 changes: 18 additions & 0 deletions src/backend/_scss/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2480,3 +2480,21 @@ a.skip:hover {
}
}
}

.track-room-names {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge rule .track-room-names with rule on line 987

color: $room-color;
margin-top: 16%;
padding-left: 30px;

&.sticky{
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opening curly brace { should be preceded by one space

position: fixed;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Properties should be ordered margin-top, max-height, overflow-y, position, top

top: 0;
overflow-y: auto;
max-height: calc(100vh - 10% - 60px);
margin-top: 60px !important;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!important should not be used

}

@media screen and (max-width: 768px) {
display: none;
}
}
21 changes: 21 additions & 0 deletions src/backend/assets/js/scroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,29 @@ $(function() {
$('html, body').animate({scrollTop: 0}, 500);
$('#down-button').fadeOut(500);
});

originTop = 0;
function pinRightBar(){
var right_bar = this.document.getElementById('right-bar')
if(right_bar){
if(originTop == 0){
originTop = right_bar.offsetTop
}

if( originTop - window.scrollY <= 5){
right_bar.classList.add('sticky')
} else {
right_bar.classList.remove('sticky')
}
}
}

$(document).ready(function(){
pinRightBar()
})

window.addEventListener('scroll', function() {
pinRightBar()
if($(window).scrollTop() > 0) {
$('#down-button').fadeIn(500);
}
Expand Down
2 changes: 1 addition & 1 deletion src/backend/templates/tracks.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
{{/days}}
</div>
</div>
<div class="track-room-names col-md-3 col-sm-3 sidebar">
<div class="track-room-names col-md-3 col-sm-3 sidebar" id="right-bar">
<div class="row">
<div class="col-md-12 col-sm-12">
<h4 class='list-title'> Tracks List </h4>
Expand Down