Merge branch 'develop_upstream'

This commit is contained in:
Manuel Schmid 2024-05-17 18:27:42 +02:00
commit 44ac5db94f
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
2 changed files with 2 additions and 2 deletions

View File

@ -391,6 +391,6 @@ progress::after {
background-color: #fff8;
font-family: monospace;
text-align: center;
border-radius-top: 5px;
border-radius: 5px 5px 0px 0px;
display: none; /* remove this to enable tooltip in preview image */
}

View File

@ -39,7 +39,7 @@ def javascript_html():
head += f'<script type="text/javascript" src="{edit_attention_js_path}"></script>\n'
head += f'<script type="text/javascript" src="{viewer_js_path}"></script>\n'
head += f'<script type="text/javascript" src="{image_viewer_js_path}"></script>\n'
head += f'<meta name="samples-path" content="{samples_path}"></meta>\n'
head += f'<meta name="samples-path" content="{samples_path}">\n'
if args_manager.args.theme:
head += f'<script type="text/javascript">set_theme(\"{args_manager.args.theme}\");</script>\n'