From b81aad78dd08a6b4600b96d4e7ca567ba150729f Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Thu, 25 Jun 2020 10:03:50 -0700 Subject: [PATCH] Rename CSS vars color_theme_* and color_site_* to color_*. There was just no point to naming them like this because all of the color vars obviously represent some part of the site's color theme. --- .../static/css/clipboard_tray.css | 2 +- .../etiquette_flask/static/css/common.css | 30 +++++++++---------- .../etiquette_flask/static/css/photo_card.css | 10 +++---- .../static/css/theme_pearl.css | 8 ++--- .../static/css/theme_slate.css | 8 ++--- .../etiquette_flask/templates/bookmarks.html | 4 +-- .../etiquette_flask/templates/photo.html | 4 +-- frontends/etiquette_flask/templates/root.html | 4 +-- .../etiquette_flask/templates/search.html | 4 +-- frontends/etiquette_flask/templates/tags.html | 2 +- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/frontends/etiquette_flask/static/css/clipboard_tray.css b/frontends/etiquette_flask/static/css/clipboard_tray.css index 05894c0..f63f472 100644 --- a/frontends/etiquette_flask/static/css/clipboard_tray.css +++ b/frontends/etiquette_flask/static/css/clipboard_tray.css @@ -12,7 +12,7 @@ min-width: 150px; padding: 2px; - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); } #clipboard_tray_expandbutton { diff --git a/frontends/etiquette_flask/static/css/common.css b/frontends/etiquette_flask/static/css/common.css index 6a37657..144a05a 100644 --- a/frontends/etiquette_flask/static/css/common.css +++ b/frontends/etiquette_flask/static/css/common.css @@ -1,7 +1,7 @@ :root { - --color_theme_primary: #00d8f4; - --color_theme_secondary: #ffffd4; + --color_primary: #00d8f4; + --color_secondary: #ffffd4; --color_tag_object_bg: #fff; --color_tag_object_fg: blue; @@ -10,11 +10,11 @@ --color_text_bubble: black; --color_text_link: blue; - --color_site_textfields: white; + --color_textfields: white; --color_text_placeholder: gray; - --color_site_transparency: rgba(0, 0, 0, 0.1); - --color_site_dropshadow: rgba(0, 0, 0, 0.25); + --color_transparency: rgba(0, 0, 0, 0.1); + --color_dropshadow: rgba(0, 0, 0, 0.25); --color_3d_shadow: rgba(0, 0, 0, 0.5); --color_3d_highlight: rgba(255, 255, 255, 0.5); @@ -56,7 +56,7 @@ input, select, textarea border: none; border-radius: 2px; - background-color: var(--color_site_textfields); + background-color: var(--color_textfields); } input::placeholder, textarea::placeholder @@ -73,7 +73,7 @@ body "content_body" 1fr /1fr; - background-color: var(--color_theme_primary); + background-color: var(--color_primary); } #header @@ -85,7 +85,7 @@ body margin: 8px; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); } #content_body { @@ -111,7 +111,7 @@ body } .header_element:hover { - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); } pre @@ -154,7 +154,7 @@ pre padding: 8px; width: var(--size_sticky_side); overflow-y: auto; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); } #content_body.sticky_side_left #left { @@ -168,8 +168,8 @@ pre { #content_body.sticky_side_right #right { - outline: 8px solid var(--color_theme_primary); - background-color: var(--color_theme_primary) !important; + outline: 8px solid var(--color_primary); + background-color: var(--color_primary) !important; } #content_body.sticky_side_right #right:before { @@ -179,7 +179,7 @@ pre bottom: 0; left: 0; right: 0; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); z-index: -1; } } @@ -196,7 +196,7 @@ pre } .panel { - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); border-radius: 5px; padding: 8px; } @@ -294,7 +294,7 @@ is hovered over. overflow-y: auto; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); } .message_bubble { diff --git a/frontends/etiquette_flask/static/css/photo_card.css b/frontends/etiquette_flask/static/css/photo_card.css index 10d9abf..9ff56a9 100644 --- a/frontends/etiquette_flask/static/css/photo_card.css +++ b/frontends/etiquette_flask/static/css/photo_card.css @@ -1,10 +1,10 @@ .album_card { - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); } .album_card:hover { - box-shadow: 2px 2px 5px 0px var(--color_site_dropshadow); + box-shadow: 2px 2px 5px 0px var(--color_dropshadow); } .album_card_list { @@ -36,7 +36,7 @@ .album_card_thumbnail { grid-area: thumbnail; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); display: flex; width: 100%; height: 150px; @@ -77,11 +77,11 @@ .photo_card { - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); } .photo_card:hover { - box-shadow: 2px 2px 5px 0px var(--color_site_dropshadow); + box-shadow: 2px 2px 5px 0px var(--color_dropshadow); } .photo_card_list { diff --git a/frontends/etiquette_flask/static/css/theme_pearl.css b/frontends/etiquette_flask/static/css/theme_pearl.css index e7b7b97..6276242 100644 --- a/frontends/etiquette_flask/static/css/theme_pearl.css +++ b/frontends/etiquette_flask/static/css/theme_pearl.css @@ -1,9 +1,9 @@ :root { - --color_theme_primary: #f6ffff; - --color_theme_secondary: #aad7ff; - --color_site_textfields: white; - --color_site_transparency: rgba(0, 0, 0, 0.1); + --color_primary: #f6ffff; + --color_secondary: #aad7ff; + --color_textfields: white; + --color_transparency: rgba(0, 0, 0, 0.1); --color_text_normal: #000; --color_text_link: #00f; --color_text_bubble: black; diff --git a/frontends/etiquette_flask/static/css/theme_slate.css b/frontends/etiquette_flask/static/css/theme_slate.css index 5026264..052cc94 100644 --- a/frontends/etiquette_flask/static/css/theme_slate.css +++ b/frontends/etiquette_flask/static/css/theme_slate.css @@ -1,9 +1,9 @@ :root { - --color_theme_primary: #222; - --color_theme_secondary: #3b4d5d; - --color_site_textfields: var(--color_theme_secondary); - --color_site_transparency: rgba(255, 255, 255, 0.05); + --color_primary: #222; + --color_secondary: #3b4d5d; + --color_textfields: var(--color_secondary); + --color_transparency: rgba(255, 255, 255, 0.05); --color_text_normal: #efefef; --color_text_link: #1edeff; --color_text_bubble: black; diff --git a/frontends/etiquette_flask/templates/bookmarks.html b/frontends/etiquette_flask/templates/bookmarks.html index 3dedab9..cef376e 100644 --- a/frontends/etiquette_flask/templates/bookmarks.html +++ b/frontends/etiquette_flask/templates/bookmarks.html @@ -33,9 +33,9 @@ max-width: 500px; border-radius: 8px; - box-shadow: 2px 2px 5px 0px var(--color_site_dropshadow); + box-shadow: 2px 2px 5px 0px var(--color_dropshadow); - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); } .bookmark_card .bookmark_url { diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html index 616e97a..274faf1 100644 --- a/frontends/etiquette_flask/templates/photo.html +++ b/frontends/etiquette_flask/templates/photo.html @@ -33,7 +33,7 @@ min-height: min-content; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); } #right { @@ -110,7 +110,7 @@ flex-direction: column; align-items: flex-end; - /*background-color: var(--color_theme_primary);*/ + /*background-color: var(--color_primary);*/ } @media screen and (max-width: 800px) diff --git a/frontends/etiquette_flask/templates/root.html b/frontends/etiquette_flask/templates/root.html index 8dc8c51..e238398 100644 --- a/frontends/etiquette_flask/templates/root.html +++ b/frontends/etiquette_flask/templates/root.html @@ -30,11 +30,11 @@ body, .nice_link { width: 50%; height: 40px; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); } .nice_link:hover { - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); } #motd { diff --git a/frontends/etiquette_flask/templates/search.html b/frontends/etiquette_flask/templates/search.html index 9e50f45..1a01d52 100644 --- a/frontends/etiquette_flask/templates/search.html +++ b/frontends/etiquette_flask/templates/search.html @@ -68,7 +68,7 @@ padding: 8px; - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); word-wrap: break-word; } @@ -122,7 +122,7 @@ border: 1px solid black; - background-color: var(--color_theme_secondary); + background-color: var(--color_secondary); font-size: 20; } diff --git a/frontends/etiquette_flask/templates/tags.html b/frontends/etiquette_flask/templates/tags.html index e6aadc3..0d4d54e 100644 --- a/frontends/etiquette_flask/templates/tags.html +++ b/frontends/etiquette_flask/templates/tags.html @@ -31,7 +31,7 @@ h2, h3 } #left > * { - background-color: var(--color_site_transparency); + background-color: var(--color_transparency); padding: 8px; border-radius: 5px; }