Skip to content

Timescale: Improve the visibility #335

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
nilmerg merged 2 commits into from
May 7, 2025
Merged

Timescale: Improve the visibility #335

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
ddf4c45
timeline.less: Fix css issues
sukhwinder33445 May 6, 2025
98255d7
Timescale: Use array_map to create child elements for timestamp
sukhwinder33445 May 6, 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
14 changes: 7 additions & 7 deletions library/Notifications/Widget/TimeGrid/Timescale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ public function assemble(): void
$time = new DateTime();
$dayTimestamps = [];
for ($i = 0; $i < $timestampPerDay; $i++) {
// am-pm is separated by non-breaking whitespace
$parts = preg_split('/\s/u', $dateFormatter->format($time->setTime($i * $timeIntervals, 0)));

$stamp = [new HtmlElement('span', null, new Text($parts[0]))];
if (isset($parts[1])) {
$stamp[] = new HtmlElement('span', null, new Text($parts[1]));
}
$stamp = array_map(
function ($part) {
return new HtmlElement('span', null, new Text($part));
},
// am-pm is separated by non-breaking whitespace
preg_split('/\s/u', $dateFormatter->format($time->setTime($i * $timeIntervals, 0)))
);

$dayTimestamps[] = new HtmlElement('span', new Attributes(['class' => 'timestamp']), ...$stamp);
$dayTimestamps[] = new HtmlElement('span', new Attributes(['class' => 'ticks']));
Expand Down
16 changes: 10 additions & 6 deletions public/css/timeline.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@

.timescale {
display: grid;
grid-template-columns: repeat(~"calc(var(--primaryColumns) * var(--timestampsPerDay))", minmax(0,1fr));
grid-template-columns: repeat(
~"calc(var(--primaryColumns) * var(--timestampsPerDay))",
minmax(~"calc(var(--minimumPrimaryColumnWidth) / var(--timestampsPerDay))", 1fr)
);

border-left: 1px solid @gray-lighter; // this is required to maintain the grid layout
grid-area: ~"4 / 2 / 4 / 3";

Expand All @@ -100,7 +104,7 @@
align-items: center;
margin-top: 0.5em;
padding-top: 0.5em;
font-size: .5em;
font-size: .75em;
position: relative;
left: -50%;
line-height: 1;
Expand All @@ -114,21 +118,21 @@
}
}

span:nth-last-of-type(2), // last .ticks before .midnight
.midnight {
> span.ticks:nth-last-of-type(2), // last .ticks and .midnight
> .timestamp.midnight {
grid-area: ~"1 / -2 / 1 / -1";
}
}

.clock {
display: grid;
grid-template-columns: repeat(var(--primaryColumns), 1fr);
grid-template-columns: repeat(var(--primaryColumns), minmax(var(--minimumPrimaryColumnWidth), 1fr));
grid-area: ~"3 / 2 / 4 / 3";
border-top: 1px solid transparent; // left not required, otherwise the .time-hand is not aligned properly

.current-day {
display: grid;
grid-template-columns: repeat(var(--columnsPerStep), 1fr);
grid-template-columns: repeat(var(--columnsPerStep), minmax(var(--minimumStepColumnWidth), 1fr));
grid-area: ~"1 / 1 / 2 / 2";

.time-hand {
Expand Down
Loading