From a68f76176f99b9a281dd163d297554cc65ff858c Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Sat, 22 Jul 2023 17:28:21 -0700 Subject: [PATCH] Move themes into one file, set by class on html element. --- .../etiquette_flask/static/css/etiquette.css | 102 ++++++++++++++++++ .../static/css/theme_hotdogstand.css | 31 ------ .../static/css/theme_pearl.css | 20 ---- .../static/css/theme_slate.css | 26 ----- .../static/css/theme_turquoise.css | 20 ---- .../etiquette_flask/templates/admin.html | 3 +- .../etiquette_flask/templates/album.html | 4 +- .../etiquette_flask/templates/bookmarks.html | 3 +- .../etiquette_flask/templates/clipboard.html | 3 +- .../etiquette_flask/templates/login.html | 3 +- .../etiquette_flask/templates/photo.html | 3 +- frontends/etiquette_flask/templates/root.html | 3 +- .../etiquette_flask/templates/search.html | 3 +- .../templates/search_embed.html | 3 +- .../etiquette_flask/templates/swipe.html | 3 +- frontends/etiquette_flask/templates/tags.html | 3 +- .../etiquette_flask/templates/template.html | 3 +- frontends/etiquette_flask/templates/user.html | 3 +- 18 files changed, 115 insertions(+), 124 deletions(-) delete mode 100644 frontends/etiquette_flask/static/css/theme_hotdogstand.css delete mode 100644 frontends/etiquette_flask/static/css/theme_pearl.css delete mode 100644 frontends/etiquette_flask/static/css/theme_slate.css delete mode 100644 frontends/etiquette_flask/static/css/theme_turquoise.css diff --git a/frontends/etiquette_flask/static/css/etiquette.css b/frontends/etiquette_flask/static/css/etiquette.css index 4aafa20..89e0918 100644 --- a/frontends/etiquette_flask/static/css/etiquette.css +++ b/frontends/etiquette_flask/static/css/etiquette.css @@ -203,3 +203,105 @@ is hovered over. { flex: 2; } + +/******************************************************************************/ +html.theme_slate +{ + --color_primary: #222; + --color_secondary: #3b4d5d; + + --color_text_normal: #efefef; + --color_text_link: #1edeff; + --color_text_bubble: black; + + --color_textfields: var(--color_secondary); + --color_text_placeholder: gray; + + --color_transparency: rgba(255, 255, 255, 0.05); + --color_dropshadow: rgba(0, 0, 0, 0.25); + --color_shadow: rgba(0, 0, 0, 0.5); + --color_highlight: rgba(255, 255, 255, 0.5); + + --color_tag_card_bg: #e6e6e6; + --color_tag_card_fg: black; +} + +html.theme_slate button, +html.theme_slate button * +{ + color: black; +} +/******************************************************************************/ +html.theme_hotdogstand +{ + --color_primary: yellow; + --color_secondary: red; + + --color_text_normal: black; + --color_text_link: rebeccapurple; + --color_text_bubble: black; + + --color_textfields: var(--color_secondary); + --color_text_placeholder: black; + + --color_transparency: yellow; + --color_dropshadow: rgba(0, 0, 0, 0.25); + --color_shadow: rgba(0, 0, 0, 0.5); + --color_highlight: rgba(255, 255, 255, 0.5); + + --color_tag_card_bg: red; + --color_tag_card_fg: white; +} + +html.theme_hotdogstand button, +html.theme_hotdogstand button * +{ + color: black; +} + +html.theme_hotdogstand .panel +{ + border: 1px solid black; +} +/******************************************************************************/ +html.theme_pearl +{ + --color_primary: #f6ffff; + --color_secondary: #aad7ff; + + --color_text_normal: black; + --color_text_link: #00f; + --color_text_bubble: black; + + --color_textfields: white; + --color_text_placeholder: gray; + + --color_transparency: rgba(0, 0, 0, 0.1); + --color_dropshadow: rgba(0, 0, 0, 0.25); + --color_shadow: rgba(0, 0, 0, 0.5); + --color_highlight: rgba(255, 255, 255, 0.5); + + --color_tag_card_bg: #fff; + --color_tag_card_fg: black; +} +/******************************************************************************/ +html.theme_turquoise +{ + --color_primary: #00d8f4; + --color_secondary: #ffffd4; + + --color_text_normal: black; + --color_text_link: blue; + --color_text_bubble: black; + + --color_textfields: white; + --color_text_placeholder: gray; + + --color_transparency: rgba(0, 0, 0, 0.1); + --color_dropshadow: rgba(0, 0, 0, 0.25); + --color_shadow: rgba(0, 0, 0, 0.5); + --color_highlight: rgba(255, 255, 255, 0.5); + + --color_tag_card_bg: #fff; + --color_tag_card_fg: blue; +} diff --git a/frontends/etiquette_flask/static/css/theme_hotdogstand.css b/frontends/etiquette_flask/static/css/theme_hotdogstand.css deleted file mode 100644 index 09fb015..0000000 --- a/frontends/etiquette_flask/static/css/theme_hotdogstand.css +++ /dev/null @@ -1,31 +0,0 @@ -:root -{ - --color_primary: yellow; - --color_secondary: red; - - --color_text_normal: black; - --color_text_link: rebeccapurple; - --color_text_bubble: black; - - --color_textfields: var(--color_secondary); - --color_text_placeholder: black; - - --color_transparency: yellow; - --color_dropshadow: rgba(0, 0, 0, 0.25); - --color_shadow: rgba(0, 0, 0, 0.5); - --color_highlight: rgba(255, 255, 255, 0.5); - - --color_tag_card_bg: red; - --color_tag_card_fg: white; -} - -button, -button * -{ - color: black; -} - -.panel -{ - border: 1px solid black; -} diff --git a/frontends/etiquette_flask/static/css/theme_pearl.css b/frontends/etiquette_flask/static/css/theme_pearl.css deleted file mode 100644 index 6b835bc..0000000 --- a/frontends/etiquette_flask/static/css/theme_pearl.css +++ /dev/null @@ -1,20 +0,0 @@ -:root -{ - --color_primary: #f6ffff; - --color_secondary: #aad7ff; - - --color_text_normal: black; - --color_text_link: #00f; - --color_text_bubble: black; - - --color_textfields: white; - --color_text_placeholder: gray; - - --color_transparency: rgba(0, 0, 0, 0.1); - --color_dropshadow: rgba(0, 0, 0, 0.25); - --color_shadow: rgba(0, 0, 0, 0.5); - --color_highlight: rgba(255, 255, 255, 0.5); - - --color_tag_card_bg: #fff; - --color_tag_card_fg: black; -} diff --git a/frontends/etiquette_flask/static/css/theme_slate.css b/frontends/etiquette_flask/static/css/theme_slate.css deleted file mode 100644 index 4c467b2..0000000 --- a/frontends/etiquette_flask/static/css/theme_slate.css +++ /dev/null @@ -1,26 +0,0 @@ -:root -{ - --color_primary: #222; - --color_secondary: #3b4d5d; - - --color_text_normal: #efefef; - --color_text_link: #1edeff; - --color_text_bubble: black; - - --color_textfields: var(--color_secondary); - --color_text_placeholder: gray; - - --color_transparency: rgba(255, 255, 255, 0.05); - --color_dropshadow: rgba(0, 0, 0, 0.25); - --color_shadow: rgba(0, 0, 0, 0.5); - --color_highlight: rgba(255, 255, 255, 0.5); - - --color_tag_card_bg: #e6e6e6; - --color_tag_card_fg: black; -} - -button, -button * -{ - color: black; -} diff --git a/frontends/etiquette_flask/static/css/theme_turquoise.css b/frontends/etiquette_flask/static/css/theme_turquoise.css deleted file mode 100644 index 6276c1d..0000000 --- a/frontends/etiquette_flask/static/css/theme_turquoise.css +++ /dev/null @@ -1,20 +0,0 @@ -:root -{ - --color_primary: #00d8f4; - --color_secondary: #ffffd4; - - --color_text_normal: black; - --color_text_link: blue; - --color_text_bubble: black; - - --color_textfields: white; - --color_text_placeholder: gray; - - --color_transparency: rgba(0, 0, 0, 0.1); - --color_dropshadow: rgba(0, 0, 0, 0.25); - --color_shadow: rgba(0, 0, 0, 0.5); - --color_highlight: rgba(255, 255, 255, 0.5); - - --color_tag_card_bg: #fff; - --color_tag_card_fg: blue; -} diff --git a/frontends/etiquette_flask/templates/admin.html b/frontends/etiquette_flask/templates/admin.html index ac2e06b..33e4edc 100644 --- a/frontends/etiquette_flask/templates/admin.html +++ b/frontends/etiquette_flask/templates/admin.html @@ -1,5 +1,5 @@ - + {% import "header.html" as header %} Admin control @@ -8,7 +8,6 @@ - {% if theme %}{% endif %} diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html index 8cabc7a..f74e317 100644 --- a/frontends/etiquette_flask/templates/album.html +++ b/frontends/etiquette_flask/templates/album.html @@ -1,5 +1,5 @@ - + {% macro shared_css() %}