Merge branch 'master' into easy-override-ua

easy-override-ua
dgtlmoon 7 months ago
commit 8277713c56

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

@ -243,7 +243,6 @@ body::after {
body::before { body::before {
// background-image set in base.html so it works with reverse proxies etc // background-image set in base.html so it works with reverse proxies etc
content: ""; content: "";
background-size: cover
} }
body:after, body:after,
@ -1083,6 +1082,9 @@ ul {
li { li {
list-style: none; list-style: none;
font-size: 0.8rem; font-size: 0.8rem;
> * {
display: inline-block;
}
} }
} }

@ -574,8 +574,7 @@ body::after {
opacity: 0.91; } opacity: 0.91; }
body::before { body::before {
content: ""; content: ""; }
background-size: cover; }
body:after, body:after,
body:before { body:before {
@ -1173,6 +1172,8 @@ ul {
#quick-watch-processor-type ul li { #quick-watch-processor-type ul li {
list-style: none; list-style: none;
font-size: 0.8rem; } font-size: 0.8rem; }
#quick-watch-processor-type ul li > * {
display: inline-block; }
.restock-label { .restock-label {
padding: 3px; padding: 3px;

@ -24,12 +24,6 @@
<meta name="msapplication-TileColor" content="#da532c"> <meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="favicons/browserconfig.xml"> <meta name="msapplication-config" content="favicons/browserconfig.xml">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<style>
body::before {
background-image: url({{url_for('static_content', group='images', filename='gradient-border.png') }});
}
</style>
<script src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script> <script src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
</head> </head>

@ -479,8 +479,9 @@ def test_correct_header_detect(client, live_server):
url_for("preview_page", uuid="first"), url_for("preview_page", uuid="first"),
follow_redirects=True follow_redirects=True
) )
assert b'&#34;world&#34;:' in res.data
assert res.data.count(b'{') >= 2 assert b'&#34;hello&#34;: 123,' in res.data
assert b'&#34;world&#34;: 123</div>' in res.data
res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True) res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
assert b'Deleted' in res.data assert b'Deleted' in res.data

Loading…
Cancel
Save