diff --git a/daemon.py b/daemon.py index 6ffe76fd5..c59fb3314 100644 --- a/daemon.py +++ b/daemon.py @@ -7965,7 +7965,6 @@ class PubServer(BaseHTTPRequestHandler): msg = \ html_person_options(self.server.default_timeline, - self.server.css_cache, self.server.translate, base_dir, domain, domain_full, @@ -7988,7 +7987,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.text_mode_banner, self.server.news_instance, authorized, - access_keys, is_group) + access_keys, is_group, + self.server.theme_name) if msg: msg = msg.encode('utf-8') msglen = len(msg) diff --git a/epicyon-options.css b/epicyon-options.css index 209d6c8cd..07218cee7 100644 --- a/epicyon-options.css +++ b/epicyon-options.css @@ -1,6 +1,9 @@ @charset "UTF-8"; :root { + --banner-height: 20vh; + --banner-height-mobile: 10vh; + --banner-height-tiny: 10vh; --avatar-rounding: 10%; --options-bg-color: #282c37; --options-link-bg-color: transparent; @@ -151,6 +154,12 @@ a:focus { } @media screen and (min-width: 400px) { + .timeline-banner { + vertical-align: top; + object-fit: cover; + width: 100%; + max-height: var(--banner-height); + } textarea { font-family: Arial, Helvetica, sans-serif; font-size: var(--font-size4); @@ -228,6 +237,12 @@ a:focus { } @media screen and (max-width: 1000px) { + .timeline-banner { + vertical-align: top; + object-fit: cover; + width: 98vw; + max-height: var(--banner-height-mobile); + } textarea { font-family: Arial, Helvetica, sans-serif; font-size: var(--font-size); @@ -305,6 +320,12 @@ a:focus { } @media screen and (max-width: 480px) { + .timeline-banner { + vertical-align: top; + object-fit: cover; + width: 98vw; + max-height: var(--banner-height-tiny); + } textarea { font-family: Arial, Helvetica, sans-serif; font-size: var(--font-size2); diff --git a/webapp_person_options.py b/webapp_person_options.py index d0ae8d4d5..2a0995904 100644 --- a/webapp_person_options.py +++ b/webapp_person_options.py @@ -29,10 +29,11 @@ from webapp_utils import html_header_with_external_style from webapp_utils import html_footer from webapp_utils import get_broken_link_substitute from webapp_utils import html_keyboard_navigation +from webapp_utils import get_banner_file def html_person_options(default_timeline: str, - css_cache: {}, translate: {}, base_dir: str, + translate: {}, base_dir: str, domain: str, domain_full: str, origin_path_str: str, options_actor: str, @@ -61,7 +62,8 @@ def html_person_options(default_timeline: str, news_instance: bool, authorized: bool, access_keys: {}, - is_group: bool) -> str: + is_group: bool, + theme: str) -> str: """Show options for a person: view/follow/block/report """ options_domain, options_port = get_domain_from_actor(options_actor) @@ -138,6 +140,21 @@ def html_person_options(default_timeline: str, options_str += html_keyboard_navigation(text_mode_banner, {}, {}) options_str += '

\n' + + # show banner + banner_file, _ = \ + get_banner_file(base_dir, nickname, domain, theme) + options_str += \ + '
\n\n' + options_str += \ + '\n' + \ + '
\n

\n' + options_str += '
\n' options_str += '
\n' options_str += '
\n'