From 08be78f9074bed5dcfe0eaf8c99c9bf7f658e98c Mon Sep 17 00:00:00 2001 From: MassiveBox Date: Fri, 14 Apr 2023 18:20:25 +0200 Subject: [PATCH] Minor graphical improvements - Uniform style of SVGs - Add style directly inside SVGs to switch to dark mode - the previous solution didn't work in Chromium for some reason --- README.md | 4 ++-- templates/default/assets/bitcoin.svg | 2 +- templates/default/assets/custom.css | 11 +---------- templates/default/assets/light-bulb.svg | 2 +- templates/default/assets/oven.svg | 2 +- templates/default/assets/washing.svg | 2 +- templates/default/base.html | 2 +- templates/default/index.html | 16 ++++------------ 8 files changed, 12 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 8d758a3..4994616 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 🌿 EcoDash -[![status-badge](https://woodpecker.massivebox.net/api/badges/ecodash/ecodash/status.svg)](https://woodpecker.massivebox.net/ecodash/ecodash) [![Visit our website](data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMTA4IiBoZWlnaHQ9IjIwIiByb2xlPSJpbWciIGFyaWEtbGFiZWw9InZpc2l0OiBvdXIgd2Vic2l0ZSI+PHRpdGxlPnZpc2l0OiBvdXIgd2Vic2l0ZTwvdGl0bGU+PGxpbmVhckdyYWRpZW50IGlkPSJzIiB4Mj0iMCIgeTI9IjEwMCUiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2JiYiIgc3RvcC1vcGFjaXR5PSIuMSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1vcGFjaXR5PSIuMSIvPjwvbGluZWFyR3JhZGllbnQ+PGNsaXBQYXRoIGlkPSJyIj48cmVjdCB3aWR0aD0iMTA4IiBoZWlnaHQ9IjIwIiByeD0iMyIgZmlsbD0iI2ZmZiIvPjwvY2xpcFBhdGg+PGcgY2xpcC1wYXRoPSJ1cmwoI3IpIj48cmVjdCB3aWR0aD0iMzMiIGhlaWdodD0iMjAiIGZpbGw9IiM1NTUiLz48cmVjdCB4PSIzMyIgd2lkdGg9Ijc1IiBoZWlnaHQ9IjIwIiBmaWxsPSIjNGMxIi8+PHJlY3Qgd2lkdGg9IjEwOCIgaGVpZ2h0PSIyMCIgZmlsbD0idXJsKCNzKSIvPjwvZz48ZyBmaWxsPSIjZmZmIiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LWZhbWlseT0iVmVyZGFuYSxHZW5ldmEsRGVqYVZ1IFNhbnMsc2Fucy1zZXJpZiIgdGV4dC1yZW5kZXJpbmc9Imdlb21ldHJpY1ByZWNpc2lvbiIgZm9udC1zaXplPSIxMTAiPjx0ZXh0IGFyaWEtaGlkZGVuPSJ0cnVlIiB4PSIxNzUiIHk9IjE1MCIgZmlsbD0iIzAxMDEwMSIgZmlsbC1vcGFjaXR5PSIuMyIgdHJhbnNmb3JtPSJzY2FsZSguMSkiIHRleHRMZW5ndGg9IjIzMCI+dmlzaXQ8L3RleHQ+PHRleHQgeD0iMTc1IiB5PSIxNDAiIHRyYW5zZm9ybT0ic2NhbGUoLjEpIiBmaWxsPSIjZmZmIiB0ZXh0TGVuZ3RoPSIyMzAiPnZpc2l0PC90ZXh0Pjx0ZXh0IGFyaWEtaGlkZGVuPSJ0cnVlIiB4PSI2OTUiIHk9IjE1MCIgZmlsbD0iIzAxMDEwMSIgZmlsbC1vcGFjaXR5PSIuMyIgdHJhbnNmb3JtPSJzY2FsZSguMSkiIHRleHRMZW5ndGg9IjY1MCI+b3VyIHdlYnNpdGU8L3RleHQ+PHRleHQgeD0iNjk1IiB5PSIxNDAiIHRyYW5zZm9ybT0ic2NhbGUoLjEpIiBmaWxsPSIjZmZmIiB0ZXh0TGVuZ3RoPSI2NTAiPm91ciB3ZWJzaXRlPC90ZXh0PjwvZz48L3N2Zz4=)](https://ecodash.xyz) [![Support the project](data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMTI0IiBoZWlnaHQ9IjIwIiByb2xlPSJpbWciIGFyaWEtbGFiZWw9InN1cHBvcnQ6IHRoZSBwcm9qZWN0Ij48dGl0bGU+c3VwcG9ydDogdGhlIHByb2plY3Q8L3RpdGxlPjxsaW5lYXJHcmFkaWVudCBpZD0icyIgeDI9IjAiIHkyPSIxMDAlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiNiYmIiIHN0b3Atb3BhY2l0eT0iLjEiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3Atb3BhY2l0eT0iLjEiLz48L2xpbmVhckdyYWRpZW50PjxjbGlwUGF0aCBpZD0iciI+PHJlY3Qgd2lkdGg9IjEyNCIgaGVpZ2h0PSIyMCIgcng9IjMiIGZpbGw9IiNmZmYiLz48L2NsaXBQYXRoPjxnIGNsaXAtcGF0aD0idXJsKCNyKSI+PHJlY3Qgd2lkdGg9IjUzIiBoZWlnaHQ9IjIwIiBmaWxsPSIjNTU1Ii8+PHJlY3QgeD0iNTMiIHdpZHRoPSI3MSIgaGVpZ2h0PSIyMCIgZmlsbD0iI2RmYjMxNyIvPjxyZWN0IHdpZHRoPSIxMjQiIGhlaWdodD0iMjAiIGZpbGw9InVybCgjcykiLz48L2c+PGcgZmlsbD0iI2ZmZiIgdGV4dC1hbmNob3I9Im1pZGRsZSIgZm9udC1mYW1pbHk9IlZlcmRhbmEsR2VuZXZhLERlamFWdSBTYW5zLHNhbnMtc2VyaWYiIHRleHQtcmVuZGVyaW5nPSJnZW9tZXRyaWNQcmVjaXNpb24iIGZvbnQtc2l6ZT0iMTEwIj48dGV4dCBhcmlhLWhpZGRlbj0idHJ1ZSIgeD0iMjc1IiB5PSIxNTAiIGZpbGw9IiMwMTAxMDEiIGZpbGwtb3BhY2l0eT0iLjMiIHRyYW5zZm9ybT0ic2NhbGUoLjEpIiB0ZXh0TGVuZ3RoPSI0MzAiPnN1cHBvcnQ8L3RleHQ+PHRleHQgeD0iMjc1IiB5PSIxNDAiIHRyYW5zZm9ybT0ic2NhbGUoLjEpIiBmaWxsPSIjZmZmIiB0ZXh0TGVuZ3RoPSI0MzAiPnN1cHBvcnQ8L3RleHQ+PHRleHQgYXJpYS1oaWRkZW49InRydWUiIHg9Ijg3NSIgeT0iMTUwIiBmaWxsPSIjMDEwMTAxIiBmaWxsLW9wYWNpdHk9Ii4zIiB0cmFuc2Zvcm09InNjYWxlKC4xKSIgdGV4dExlbmd0aD0iNjEwIj50aGUgcHJvamVjdDwvdGV4dD48dGV4dCB4PSI4NzUiIHk9IjE0MCIgdHJhbnNmb3JtPSJzY2FsZSguMSkiIGZpbGw9IiNmZmYiIHRleHRMZW5ndGg9IjYxMCI+dGhlIHByb2plY3Q8L3RleHQ+PC9nPjwvc3ZnPg==)](https://ecodash.xyz/contribute) +[![status-badge](https://woodpecker.massivebox.net/api/badges/ecodash/ecodash/status.svg)](https://woodpecker.massivebox.net/ecodash/ecodash) [![Visit our website](https://cloud.massivebox.net/api/public/dl/yEzoZyW8?inline=true)](https://ecodash.xyz) [![Support the project](https://cloud.massivebox.net/api/public/dl/dthbBylL?inline=true)](https://ecodash.xyz/contribute) EcoDash is a simple way to show your users how much your server consumes. It's intended as a medium of transparency, that gives your users an idea about the consumption of your machine. It's not meant to be 100% accurate. @@ -35,4 +35,4 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -``` \ No newline at end of file +``` diff --git a/templates/default/assets/bitcoin.svg b/templates/default/assets/bitcoin.svg index 1a07013..e0626c3 100644 --- a/templates/default/assets/bitcoin.svg +++ b/templates/default/assets/bitcoin.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/templates/default/assets/custom.css b/templates/default/assets/custom.css index fee24b1..1184003 100644 --- a/templates/default/assets/custom.css +++ b/templates/default/assets/custom.css @@ -24,7 +24,7 @@ h3 { } .home-cards h3 { padding-top: 10px } nav { border-bottom: 1px solid #aaa} -svg { width: 100% } +svg, footer img { width: 100% } @media (prefers-color-scheme: dark) { @@ -46,13 +46,4 @@ svg { width: 100% } fill: white; } - .washing-svg * { - fill: white !important; - } - - .bitcoin-svg * { - fill: none; - stroke: white !important; - } - } \ No newline at end of file diff --git a/templates/default/assets/light-bulb.svg b/templates/default/assets/light-bulb.svg index 391b3cf..4ee084e 100644 --- a/templates/default/assets/light-bulb.svg +++ b/templates/default/assets/light-bulb.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/templates/default/assets/oven.svg b/templates/default/assets/oven.svg index 55b34cf..86cdbcf 100644 --- a/templates/default/assets/oven.svg +++ b/templates/default/assets/oven.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/templates/default/assets/washing.svg b/templates/default/assets/washing.svg index ec5130c..0daa531 100644 --- a/templates/default/assets/washing.svg +++ b/templates/default/assets/washing.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/templates/default/base.html b/templates/default/base.html index b14cb7e..4842cd6 100644 --- a/templates/default/base.html +++ b/templates/default/base.html @@ -10,7 +10,7 @@