Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2022-04-11 17:53:53 +01:00
commit 83fef83956
8 changed files with 17 additions and 7 deletions

View File

@ -1500,6 +1500,6 @@ def create_edits_html(edits_json: {}, post_json_object: {},
content = prev_content
if not edits_str:
return ''
return '<br><details><summary class="cw">' + \
return '<details><summary class="cw">' + \
translate['SHOW EDITS'] + '</summary>' + \
edits_str + '</details>'

View File

@ -209,6 +209,8 @@
--vcard-icon-size: 32px;
--vcard-icon-size-mobile: 80px;
--vcard-icon-size-tiny: 80px;
--diff-add: #FFFFFF;
--diff-remove: #aaa;
}
@font-face {
@ -263,13 +265,11 @@ mark {
}
.diff_add {
color: var(--main-link-color);
text-decoration: underline;
color: var(--diff-add);
}
.diff_remove {
color: var(--title-color);
text-decoration: underline;
color: var(--diff-remove);
}
.accesskeys {

View File

@ -6982,7 +6982,7 @@ def _test_diff_content() -> None:
create_edits_html(edits_json, post_json_object, translate, timezone)
assert html_str
expected = \
'<br><details><summary class="cw">SHOW EDITS</summary>' + \
'<details><summary class="cw">SHOW EDITS</summary>' + \
'<p><b>Mon Dec 14, 01:07</b></p><p><label class="diff_add">' + \
'+ This is some content</label><br><label class="diff_remove">' + \
'- This is some previous content</label><br>' + \

View File

@ -1,4 +1,6 @@
{
"diff-add": "#111",
"diff-remove": "#333",
"pwa-theme-color": "apple-mobile-web-app-status-bar-style",
"pwa-theme-background-color": "black-translucent",
"dropdown-fg-color": "#222",

View File

@ -254,5 +254,7 @@
"banner-height": "15vh",
"post-separator-margin-top": "0",
"post-separator-margin-bottom": "0",
"header-font": "Arial, Helvetica, sans-serif"
"header-font": "Arial, Helvetica, sans-serif",
"diff-add": "#FFFFFF",
"diff-remove": "#aaa"
}

View File

@ -1,4 +1,6 @@
{
"diff-add": "#111",
"diff-remove": "#333",
"pwa-theme-color": "apple-mobile-web-app-status-bar-style",
"pwa-theme-background-color": "black-translucent",
"dropdown-fg-color": "black",

View File

@ -1,4 +1,6 @@
{
"diff-add": "#111",
"diff-remove": "#333",
"pwa-theme-color": "apple-mobile-web-app-status-bar-style",
"pwa-theme-background-color": "black-translucent",
"dropdown-fg-color": "#2d2c37",

View File

@ -1,4 +1,6 @@
{
"diff-add": "#111",
"diff-remove": "#333",
"pwa-theme-color": "apple-mobile-web-app-status-bar-style",
"pwa-theme-background-color": "black-translucent",
"dropdown-fg-color": "black",