#132 | #121: backoffice / dev-1.0-121 #131

Merged
thomas merged 151 commits from dev-1.0-121 into develop-1.0 2024-04-28 20:02:14 +00:00
3 changed files with 12 additions and 5 deletions
Showing only changes of commit 9c3eaf05c7 - Show all commits

View File

@ -193,7 +193,10 @@ class Log(Renderable, models.Model):
len(logs), len(logs),
) )
if index is not None and index > 0: if index is not None and index > 0:
object_list += logs[:index] if log_slice:
object_list += logs[: min(log_slice, index)]
else:
object_list += logs[:index]
logs = logs[index:] logs = logs[index:]
if len(logs): if len(logs):
@ -209,8 +212,6 @@ class Log(Renderable, models.Model):
) )
if index is not None and index > 0: if index is not None and index > 0:
logs = logs[index:] logs = logs[index:]
if log_slice:
logs = logs[:log_slice]
# - add diff # - add diff
object_list.append(diff) object_list.append(diff)

View File

@ -8830,8 +8830,11 @@ preview-header:not(.no-cover) .preview-card-headings .heading {
width: 3em; width: 3em;
} }
.player-container {
z-index: 1000000;
}
.a-player { .a-player {
z-index: 10000;
box-shadow: 0em -0.5em 0.5em rgba(0, 0, 0, 0.05); box-shadow: 0em -0.5em 0.5em rgba(0, 0, 0, 0.05);
} }
.a-player a { .a-player a {

View File

@ -1018,8 +1018,11 @@ nav li {
//-- player //-- player
.player-container {
z-index: 1000000;
}
.a-player { .a-player {
z-index: 10000;
box-shadow: 0em -0.5em 0.5em rgba(0, 0, 0, 0.05); box-shadow: 0em -0.5em 0.5em rgba(0, 0, 0, 0.05);
a { color: var(--highlight-color-2); } a { color: var(--highlight-color-2); }