diff --git a/app/routes/chat.py b/app/routes/chat.py index 9dcaf07..1498aa4 100644 --- a/app/routes/chat.py +++ b/app/routes/chat.py @@ -6,7 +6,8 @@ from flask import send_file, url_for def chat(): return render('chat.html', styles=[ - '+css/v5shoutbox.css'], + '+css/v5shoutbox.css', + '+css/shoutbox.css'], scripts=[ '-scripts/trigger_menu.js', '-scripts/editor.js']) diff --git a/app/static/css/shoutbox.css b/app/static/css/shoutbox.css index 8b49ee8..94224c1 100644 --- a/app/static/css/shoutbox.css +++ b/app/static/css/shoutbox.css @@ -1,34 +1,6 @@ -#shoutbox { - margin: 20px 5% 10px 5%; - background: #ffffff; +#v5shoutbox { + --shoutbox-color: var(--text); + --shoutbox-border-color: var(--border, #d8d8d8); + --shoutbox-header-bg: var(--background-alt); + --shoutbox-link-color: var(--links); } -#shoutbox > div { - margin: 0; - padding: 0; - height: 125px; - width: 100%; - overflow-y: scroll; - border-bottom: 1px solid var(--border); - border-radius: 5px 5px 0 0; -} -#shoutbox > div > div { - padding: 2px 10px; - border-bottom: 1px solid rgba(0,0,0,.3); - font-size: 11px; -} -#shoutbox > div > div:hover { - background: var(--background); -} -#shoutbox > div > div:last-child { - border-bottom: none; -} -#shoutbox > input { - width: 100%; - padding: 5px 0; - border-radius: 0 0 5px 5px; - border: 1px solid var(--border); -} -#shoutbox > input:focus { - border-color: var(--border-focus); - box-shadow: inset 0 1px 1px rgba(0,0,0,0.075), 0 0 8px rgba(161,34,34,0.6); -} \ No newline at end of file diff --git a/app/static/css/themes/FK_dark_theme.css b/app/static/css/themes/FK_dark_theme.css index bba8d16..ab0f92b 100644 --- a/app/static/css/themes/FK_dark_theme.css +++ b/app/static/css/themes/FK_dark_theme.css @@ -11,6 +11,7 @@ :root { --background: #171a1c; /*22292c, 1c2124, 1E1E1E, 242424,*/ + --background-alt: #171a1c; --text: #eaeaea; --text-light: #e2e2e2; diff --git a/app/static/css/themes/Tituya_v43_theme.css b/app/static/css/themes/Tituya_v43_theme.css index 7dda869..0daf703 100644 --- a/app/static/css/themes/Tituya_v43_theme.css +++ b/app/static/css/themes/Tituya_v43_theme.css @@ -5,6 +5,7 @@ :root { --background: #fff; + --background-alt: #eee; --text: #030303; --text-light: #b62727; diff --git a/app/static/css/themes/default_theme.css b/app/static/css/themes/default_theme.css index d885174..6467022 100644 --- a/app/static/css/themes/default_theme.css +++ b/app/static/css/themes/default_theme.css @@ -2,6 +2,7 @@ :root { --background: #fff; + --background-alt: rgba(0, 0, 0, .1); --text: #000; --text-light: #111; @@ -30,7 +31,7 @@ table { --border: #d8d8d8; } table tr:nth-child(odd) { - --background: rgba(0, 0, 0, .1); + --background: var(--background-alt); } table th { --background: #eee; diff --git a/submodules/v5shoutbox b/submodules/v5shoutbox index 8bda9f9..4e3118c 160000 --- a/submodules/v5shoutbox +++ b/submodules/v5shoutbox @@ -1 +1 @@ -Subproject commit 8bda9f96a943a2e08220c4ca85330e03538aa5dc +Subproject commit 4e3118c779ce3048182033f79206b5f57e3d13a3