From b9579bffb2ecbfbdf0837436d39aa5e5342783e6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 11 Apr 2022 17:05:46 +0100 Subject: [PATCH 1/3] Change edits style --- epicyon-profile.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epicyon-profile.css b/epicyon-profile.css index 4062d2729..a60c47c5d 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -263,13 +263,11 @@ mark { } .diff_add { - color: var(--main-link-color); - text-decoration: underline; + color: var(--time-color); } .diff_remove { color: var(--title-color); - text-decoration: underline; } .accesskeys { From f412070f99266365576ecc2588548d6cdfd7bada Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 11 Apr 2022 17:09:51 +0100 Subject: [PATCH 2/3] Remove extra line from edits --- content.py | 2 +- tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content.py b/content.py index be1a07503..f6634c1fc 100644 --- a/content.py +++ b/content.py @@ -1500,6 +1500,6 @@ def create_edits_html(edits_json: {}, post_json_object: {}, content = prev_content if not edits_str: return '' - return '
' + \ + return '
' + \ translate['SHOW EDITS'] + '' + \ edits_str + '
' diff --git a/tests.py b/tests.py index 6eacaa61f..9e8f9fdec 100644 --- a/tests.py +++ b/tests.py @@ -6982,7 +6982,7 @@ def _test_diff_content() -> None: create_edits_html(edits_json, post_json_object, translate, timezone) assert html_str expected = \ - '
SHOW EDITS' + \ + '
SHOW EDITS' + \ '

Mon Dec 14, 01:07



' + \ From fe00f833d92eb84ed8b6f1106268d8bc3d5eb718 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 11 Apr 2022 17:27:21 +0100 Subject: [PATCH 3/3] Separate colors for diffs --- epicyon-profile.css | 6 ++++-- theme/debian/theme.json | 2 ++ theme/default/theme.json | 4 +++- theme/indymediamodern/theme.json | 2 ++ theme/light/theme.json | 2 ++ theme/pixel/theme.json | 2 ++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/epicyon-profile.css b/epicyon-profile.css index a60c47c5d..9b678c737 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -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,11 +265,11 @@ mark { } .diff_add { - color: var(--time-color); + color: var(--diff-add); } .diff_remove { - color: var(--title-color); + color: var(--diff-remove); } .accesskeys { diff --git a/theme/debian/theme.json b/theme/debian/theme.json index 6455abd19..8e892683d 100644 --- a/theme/debian/theme.json +++ b/theme/debian/theme.json @@ -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", diff --git a/theme/default/theme.json b/theme/default/theme.json index b75a33daa..d376c0ed6 100644 --- a/theme/default/theme.json +++ b/theme/default/theme.json @@ -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" } diff --git a/theme/indymediamodern/theme.json b/theme/indymediamodern/theme.json index eb8434688..a2078a56b 100644 --- a/theme/indymediamodern/theme.json +++ b/theme/indymediamodern/theme.json @@ -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", diff --git a/theme/light/theme.json b/theme/light/theme.json index 7fdcecec1..8e58632e3 100644 --- a/theme/light/theme.json +++ b/theme/light/theme.json @@ -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", diff --git a/theme/pixel/theme.json b/theme/pixel/theme.json index fd6e68145..7a50276c1 100644 --- a/theme/pixel/theme.json +++ b/theme/pixel/theme.json @@ -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",