Skip to content
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
22 changes: 13 additions & 9 deletions library/Notifications/Widget/Timeline.php
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,19 @@ protected function assemble()
new HtmlElement(
'div',
Attributes::create(['class' => 'new-rotation-content']),
TemplateString::create(
$newRotationMsg,
[
'button' => (new Link(
new Icon('circle-plus'),
Links::rotationAdd($this->scheduleId),
['class' => empty($this->rotations) ? 'btn-primary' : null]
))->openInModal()
]
new HtmlElement(
'span',
null,
TemplateString::create(
$newRotationMsg,
[
'button' => (new Link(
new Icon('circle-plus'),
Links::rotationAdd($this->scheduleId),
['class' => empty($this->rotations) ? 'btn-primary' : null]
))->openInModal()
]
)
)
)
))
Expand Down
7 changes: 0 additions & 7 deletions public/css/calendar.less
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@
.entry {
border: 1px solid var(--entry-border-color);
background-color: var(--entry-bg);
mix-blend-mode: screen;
.rounded-corners();

a:hover {
Expand Down Expand Up @@ -382,9 +381,3 @@
color: @text-color-light;
}
}

@light-mode: {
.time-grid .entry {
mix-blend-mode: revert;
}
};
6 changes: 4 additions & 2 deletions public/css/timeline.less
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
}

&:hover {
mix-blend-mode: normal;
.rotation-info {
z-index: 1;
display: flex;
Expand Down Expand Up @@ -301,14 +300,17 @@

.new-rotation-content {
pointer-events: all;
z-index: 2; // Grid gaps must not bleed through, in day mode the time-hand must be below the button
height: var(--stepRowHeight);
display: flex;
align-items: baseline;
justify-content: center;
align-content: center;
flex-wrap: wrap;
gap: .417em;

> span {
z-index: 2; // Grid gaps must not bleed through, in day mode the time-hand must be below the button
}
}
}
}
Expand Down
Loading