From 808b05b89bbc46f113a41bb141c6af5bb60e8b37 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 5 Jul 2022 10:16:41 +0100 Subject: [PATCH] Back to the numerals --- epicyon-profile.css | 7 +++++++ theme/blue/theme.json | 1 + theme/debian/theme.json | 1 + theme/default/theme.json | 1 + theme/hacker/theme.json | 1 + theme/henge/theme.json | 1 + theme/indymediaclassic/theme.json | 1 + theme/indymediamodern/theme.json | 1 + theme/lcd/theme.json | 1 + theme/light/theme.json | 1 + theme/night/theme.json | 1 + theme/pixel/theme.json | 1 + theme/purple/theme.json | 1 + theme/rc3/theme.json | 1 + theme/solidaric/theme.json | 1 + theme/starlight/theme.json | 1 + theme/zen/theme.json | 1 + webapp_timeline.py | 12 ++---------- 18 files changed, 25 insertions(+), 10 deletions(-) diff --git a/epicyon-profile.css b/epicyon-profile.css index 250850a0c..c2e2b7384 100644 --- a/epicyon-profile.css +++ b/epicyon-profile.css @@ -33,6 +33,7 @@ --main-bg-color-report: #221c27; --main-header-color-roles: #282237; --pageslist-color: #dddddd; + --pageslist-selected-color: green; --main-fg-color: #dddddd; --cw-color: #dddddd; --cw-style: normal; @@ -1869,6 +1870,8 @@ h3 { color: var(--pageslist-color); } .pageslist mark { + color: var(--pageslist-selected-color); + font-weight: bold; } .pageslistDash { } @@ -2667,6 +2670,8 @@ h3 { color: var(--pageslist-color); } .pageslist mark { + color: var(--pageslist-selected-color); + font-weight: bold; } .pageslistDash { font-size: var(--font-page-dash-mobile); @@ -3462,6 +3467,8 @@ h3 { color: var(--pageslist-color); } .pageslist mark { + color: var(--pageslist-selected-color); + font-weight: bold; } .pageslistDash { font-size: var(--font-page-dash-tiny); diff --git a/theme/blue/theme.json b/theme/blue/theme.json index 67ae7c2c0..8cbf8a735 100644 --- a/theme/blue/theme.json +++ b/theme/blue/theme.json @@ -23,6 +23,7 @@ "gallery-font-size": "35px", "gallery-font-size-mobile": "55px", "pageslist-color": "#dddddd", + "pageslist-selected-color": "white", "main-bg-color": "#002365", "login-bg-color": "#002365", "welcome-bg-color": "#002365", diff --git a/theme/debian/theme.json b/theme/debian/theme.json index 3bb1401b5..14d5b6c29 100644 --- a/theme/debian/theme.json +++ b/theme/debian/theme.json @@ -67,6 +67,7 @@ "main-header-color-roles": "#ebebf0", "cw-color": "#2d2c37", "pageslist-color": "#111", + "pageslist-selected-color": "blue", "main-fg-color": "#2d2c37", "login-fg-color": "white", "welcome-fg-color": "white", diff --git a/theme/default/theme.json b/theme/default/theme.json index 72bab3d1e..41ec87dcb 100644 --- a/theme/default/theme.json +++ b/theme/default/theme.json @@ -218,6 +218,7 @@ "main-bg-color-report": "#221c27", "main-header-color-roles": "#282237", "pageslist-color": "#dddddd", + "pageslist-selected-color": "green", "main-fg-color": "#dddddd", "day-number": "#dddddd", "day-number2": "#bbbbbb", diff --git a/theme/hacker/theme.json b/theme/hacker/theme.json index d96854892..545edb96f 100644 --- a/theme/hacker/theme.json +++ b/theme/hacker/theme.json @@ -59,6 +59,7 @@ "main-header-color-roles": "#1f192d", "cw-color": "#9ad791", "pageslist-color": "#dddddd", + "pageslist-selected-color": "white", "main-fg-color": "#9ad791", "login-fg-color": "#9ad791", "welcome-fg-color": "#9ad791", diff --git a/theme/henge/theme.json b/theme/henge/theme.json index 459989a12..e13ffd9ae 100644 --- a/theme/henge/theme.json +++ b/theme/henge/theme.json @@ -48,6 +48,7 @@ "options-main-visited-color": "#e1c4bc", "cw-color": "white", "pageslist-color": "white", + "pageslist-selected-color": "yellow", "main-fg-color": "white", "options-fg-color": "white", "column-left-fg-color": "white", diff --git a/theme/indymediaclassic/theme.json b/theme/indymediaclassic/theme.json index 3301bebbe..225e7b772 100644 --- a/theme/indymediaclassic/theme.json +++ b/theme/indymediaclassic/theme.json @@ -57,6 +57,7 @@ "options-main-visited-color": "#ffb900", "cw-color": "white", "pageslist-color": "white", + "pageslist-selected-color": "yellow", "main-fg-color": "white", "login-fg-color": "white", "welcome-fg-color": "white", diff --git a/theme/indymediamodern/theme.json b/theme/indymediamodern/theme.json index 2ce57516b..f5d7cf055 100644 --- a/theme/indymediamodern/theme.json +++ b/theme/indymediamodern/theme.json @@ -116,6 +116,7 @@ "main-header-color-roles": "#ebebf0", "cw-color": "black", "pageslist-color": "black", + "pageslist-selected-color": "blue", "main-fg-color": "black", "login-fg-color": "black", "welcome-fg-color": "black", diff --git a/theme/lcd/theme.json b/theme/lcd/theme.json index d27f90a2f..a63827637 100644 --- a/theme/lcd/theme.json +++ b/theme/lcd/theme.json @@ -32,6 +32,7 @@ "main-header-color-roles": "#9fb42b", "cw-color": "#33390d", "pageslist-color": "#111", + "pageslist-selected-color": "#333", "main-fg-color": "#33390d", "login-fg-color": "#33390d", "welcome-fg-color": "#33390d", diff --git a/theme/light/theme.json b/theme/light/theme.json index 3e4b80b6a..1d1c0496a 100644 --- a/theme/light/theme.json +++ b/theme/light/theme.json @@ -53,6 +53,7 @@ "main-header-color-roles": "#ebebf0", "cw-color": "#777", "pageslist-color": "#111", + "pageslist-selected-color": "blue", "main-fg-color": "#2d2c37", "login-fg-color": "#2d2c37", "welcome-fg-color": "#2d2c37", diff --git a/theme/night/theme.json b/theme/night/theme.json index 6deddd9bd..c47f613dd 100644 --- a/theme/night/theme.json +++ b/theme/night/theme.json @@ -47,6 +47,7 @@ "options-main-link-color-hover": "#d09338", "cw-color": "#0481f5", "pageslist-color": "#bbbbbb", + "pageslist-selected-color": "lightblue", "main-fg-color": "#0481f5", "login-fg-color": "#0481f5", "welcome-fg-color": "#0481f5", diff --git a/theme/pixel/theme.json b/theme/pixel/theme.json index bbab2e108..1e656c4f7 100644 --- a/theme/pixel/theme.json +++ b/theme/pixel/theme.json @@ -74,6 +74,7 @@ "column-left-header-color": "white", "column-left-fg-color": "black", "pageslist-color": "black", + "pageslist-selected-color": "purple", "main-fg-color": "black", "dropdown-fg-color": "black", "dropdown-fg-color-hover": "#222", diff --git a/theme/purple/theme.json b/theme/purple/theme.json index aae684d65..b77f956c2 100644 --- a/theme/purple/theme.json +++ b/theme/purple/theme.json @@ -43,6 +43,7 @@ "main-header-color-roles": "#1f192d", "cw-color": "#f98bb0", "pageslist-color": "#dddddd", + "pageslist-selected-color": "white", "main-fg-color": "#f98bb0", "login-fg-color": "#f98bb0", "welcome-fg-color": "#f98bb0", diff --git a/theme/rc3/theme.json b/theme/rc3/theme.json index 527cbdad5..d346c49ef 100644 --- a/theme/rc3/theme.json +++ b/theme/rc3/theme.json @@ -69,6 +69,7 @@ "options-main-link-color-hover": "#46eed5", "cw-color": "white", "pageslist-color": "white", + "pageslist-selected-color": "#dddddd", "main-fg-color": "white", "login-fg-color": "white", "welcome-fg-color": "white", diff --git a/theme/solidaric/theme.json b/theme/solidaric/theme.json index 6eb77f8dd..da76aaf24 100644 --- a/theme/solidaric/theme.json +++ b/theme/solidaric/theme.json @@ -58,6 +58,7 @@ "main-header-color-roles": "#ebebf0", "cw-color": "#2d2c37", "pageslist-color": "#111", + "pageslist-selected-color": "#444", "main-fg-color": "#2d2c37", "login-fg-color": "#2d2c37", "welcome-fg-color": "#2d2c37", diff --git a/theme/starlight/theme.json b/theme/starlight/theme.json index a40cf6957..a34d208b3 100644 --- a/theme/starlight/theme.json +++ b/theme/starlight/theme.json @@ -46,6 +46,7 @@ "options-main-visited-color": "#e1c4bc", "cw-color": "#ffc4bc", "pageslist-color": "#dddddd", + "pageslist-selected-color": "red", "main-fg-color": "#ffc4bc", "login-fg-color": "#ffc4bc", "welcome-fg-color": "#ffc4bc", diff --git a/theme/zen/theme.json b/theme/zen/theme.json index e2c961fe7..62c1b5e0c 100644 --- a/theme/zen/theme.json +++ b/theme/zen/theme.json @@ -33,6 +33,7 @@ "dropdown-bg-color-hover": "#463b35", "cw-color": "#d5c7b7", "pageslist-color": "#dddddd", + "pageslist-selected-color": "yellow", "main-fg-color": "#d5c7b7", "column-left-fg-color": "#d5c7b7", "button-text": "#d5c7b7", diff --git a/webapp_timeline.py b/webapp_timeline.py index 94f7437d2..f85fe70ce 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -432,14 +432,6 @@ def _page_number_buttons(users_path: str, box_name: str, page_number: int) -> str: """Shows selactable page numbers at the bottom of the screen """ - page_number_chars_highlighted = ( - '⓿', '❶', '❷', '❸', '❹', '❺', '❻', '❼', '❽', '❾', - '❿', '⓫', '⓬', '⓭', '⓮', '⓯', '⓰', '⓱', '⓲', '⓳', '⓴' - ) - page_number_chars = ( - '⓪', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', - '⑩', '⑪', '⑫', '⑬', '⑭', '⑮', '⑯', '⑰', '⑱', '⑲', '⑳' - ) pages_width = 3 min_page_number = page_number - pages_width min_page_number = max(min_page_number, 1) @@ -451,12 +443,12 @@ def _page_number_buttons(users_path: str, box_name: str, '' num_str += html_hide_from_screen_reader(separator_str) aria_page_str = '' - page_str = ' ' + page_number_chars[page] + ' ' + page_str = ' ' + str(page) + ' ' curr_page_str = '' if page == page_number: page_str = \ html_hide_from_screen_reader('') + \ - page_number_chars_highlighted[page] + \ + str(page) + \ html_hide_from_screen_reader('') aria_page_str = ' aria-current="true"' curr_page_str = 'Current Page, '