Skip to content

fix scroll cutoff #157

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

Merged
eebbesen merged 2 commits into from
Aug 2, 2025
Merged

fix scroll cutoff #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
929a507
fix scroll cutoff
eebbesen Aug 2, 2025
fa9fa84
refactoring
eebbesen Aug 2, 2025
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
21 changes: 15 additions & 6 deletions StpFoodBlazor/Components/Layout/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
<main>
<div class="top-row px-4" id="navbar">
<div class="container d-md-flex" id="navbar-items">
<div id="messages" class="messages text-center marquee w-100 d-none d-md-block">
<div class="marquee-content d-flex align-items-stretch">
@foreach (var holiday in holidayStrings)
{
<span class="holiday m-auto p-3">@holiday</span>
}
<div id="messages" class="marquee-container d-none d-md-block">
<div class="marquee-inner">
@RenderHolidayStrings()
@RenderHolidayStrings()
</div>
</div>
<div class="d-flex" id="nav-links" style="align-items: center;">
Expand Down Expand Up @@ -94,4 +92,15 @@

return " flex-fill";
}

private RenderFragment RenderHolidayStrings() => builder =>
{
foreach (var holiday in holidayStrings)
{
builder.OpenElement(0, "span");
builder.AddAttribute(1, "class", "holiday m-auto p-3");
builder.AddContent(2, holiday);
builder.CloseElement();
}
};
}
42 changes: 28 additions & 14 deletions StpFoodBlazor/wwwroot/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,34 @@ h1:focus {
outline: none;
}

@keyframes scroll-left {
0% { transform: translateX(100%); }
100% { transform: translateX(-120%); }
}

.marquee {
white-space: nowrap;
overflow: hidden;
box-sizing: border-box;
}

.marquee-content {
animation: scroll-left 45s linear infinite;
animation-delay: -1s;
@keyframes marquee {
from {
transform: translateX(0);
}
to {
transform: translateX(-50%);
}
}

.marquee-container {
width: 100%;
overflow: hidden;
/* Optional styling */
background: #f9f9f9;
white-space: nowrap;
}

.marquee-inner {
display: inline-block;
/* Set width to fit content of both spans */
white-space: nowrap;
/* Animation */
animation: marquee 25s linear infinite;
}

.marquee-inner span {
display: inline-block;
padding-right: 2rem; /* gap between repeats, adjust as needed */
}

.holiday {
Expand Down
16 changes: 8 additions & 8 deletions StpFoodBlazorTest/Layout/MainLayoutTest.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
var navbar = cut.Find("#navbar-items");
var navlinks = cut.Find("#nav-links");

Assert.Equal("messages text-center marquee w-100 d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-content d-flex align-items-stretch", navbar.Children[0].Children[0].ClassName);
Assert.Equal("marquee-container d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-inner", navbar.Children[0].Children[0].ClassName);
Assert.Equal(" d-none", navlinks.Children[0].ClassName);
Assert.Equal(" flex-fill position-relative", navlinks.Children[1].ClassName);
Assert.Equal(" justify-content-end", navlinks.Children[2].ClassName);
Expand All @@ -61,8 +61,8 @@
var navbar = cut.Find("#navbar-items");
var navlinks = cut.Find("#nav-links");

Assert.Equal("messages text-center marquee w-100 d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-content d-flex align-items-stretch", navbar.Children[0].Children[0].ClassName);
Assert.Equal("marquee-container d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-inner", navbar.Children[0].Children[0].ClassName);
Assert.Equal(" flex-fill", navlinks.Children[0].ClassName);
Assert.Equal(" justify-content-end position-relative", navlinks.Children[1].ClassName);
Assert.Equal(" d-none", navlinks.Children[2].ClassName);
Expand All @@ -76,8 +76,8 @@
var navbar = cut.Find("#navbar-items");
var navlinks = cut.Find("#nav-links");

Assert.Equal("messages text-center marquee w-100 d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-content d-flex align-items-stretch", navbar.Children[0].Children[0].ClassName);
Assert.Equal("marquee-container d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-inner", navbar.Children[0].Children[0].ClassName);
Assert.Equal(" flex-fill", navlinks.Children[0].ClassName);
}

Expand All @@ -90,8 +90,8 @@
var navbar = cut.Find("#navbar-items");
var navlinks = cut.Find("#nav-links");

Assert.Equal("messages text-center marquee w-100 d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-content d-flex align-items-stretch", navbar.Children[0].Children[0].ClassName);
Assert.Equal("marquee-container d-none d-md-block", navbar.Children[0].ClassName);
Assert.Equal("marquee-inner", navbar.Children[0].Children[0].ClassName);
Assert.Equal(" d-none", navlinks.Children[0].ClassName);
Assert.Equal(" flex-fill position-relative", navlinks.Children[1].ClassName);
Assert.Equal(" justify-content-end", navlinks.Children[2].ClassName);
Expand Down
Loading