Merge 4869df86ae into 7460decff8

PVEDiscordDark/images/dd_icon-die.svg

@@ -1 +1,80 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg41" width="800" height="800" version="1.1" viewBox="0 0 211.667 211.667"><metadata id="metadata47"/><g id="layer1" transform="translate(0,-85.333333)"><rect ry="25.1" style="fill:none;stroke:#fff;stroke-width:15.875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" id="rect3852" width="178.399" height="178.399" x="16.634" y="101.967"/><circle id="path4663" cx="105.833" cy="191.167" r="18" style="fill:#fff;fill-opacity:1;stroke:none;stroke-width:13.22916603;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"/><circle id="path4663-3" cx="149.834" cy="235.166" r="18" style="fill:#fff;fill-opacity:1;stroke:none;stroke-width:13.22916698;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"/><circle id="path4663-6" cx="61.834" cy="147.166" r="18" style="fill:#fff;fill-opacity:1;stroke:none;stroke-width:13.22916698;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"/></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="icon-die.svg"
+   id="svg41"
+   version="1.1"
+   viewBox="0 0 211.66667 211.66667"
+   height="800"
+   width="800">
+  <metadata
+     id="metadata47">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs45" />
+  <sodipodi:namedview
+     inkscape:current-layer="layer1"
+     inkscape:window-maximized="0"
+     inkscape:window-y="302"
+     inkscape:window-x="750"
+     inkscape:cy="400"
+     inkscape:cx="218.82353"
+     inkscape:zoom="1.0625"
+     showgrid="false"
+     id="namedview43"
+     inkscape:window-height="480"
+     inkscape:window-width="820"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <g
+     transform="translate(0,-85.333333)"
+     id="layer1">
+    <rect
+       ry="25.09997"
+       style="fill:none;stroke:#ffffff;stroke-width:15.875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       y="101.96732"
+       x="16.633987"
+       height="178.39868"
+       width="178.3987"
+       id="rect3852" />
+    <circle
+       r="18"
+       cy="191.16667"
+       cx="105.83334"
+       id="path4663"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.22916603;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    <circle
+       r="18"
+       cy="235.16634"
+       cx="149.83366"
+       id="path4663-3"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.22916698;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    <circle
+       r="18"
+       cy="147.16634"
+       cx="61.833668"
+       id="path4663-6"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:13.22916698;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+  </g>
+</svg>

PVEDiscordDark/images/dd_icon-fa-network-wired.svg

@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" preserveAspectRatio="xMinYMin meet" viewBox="0 0 640 512"><rect id="svgEditorBackground" width="640" height="512" x="0" y="0" style="fill:none;stroke:none"/><path d="M640,264v-16c0,-8.84,-7.16,-16,-16,-16H344v-40h72c17.67,0,32,-14.33,32,-32V32c0,-17.67,-14.33,-32,-32,-32H224c-17.67,0,-32,14.33,-32,32v128c0,17.67,14.33,32,32,32h72v40H16c-8.84,0,-16,7.16,-16,16v16c0,8.84,7.16,16,16,16h104v40H64c-17.67,0,-32,14.33,-32,32v128c0,17.67,14.33,32,32,32h160c17.67,0,32,-14.33,32,-32V352c0,-17.67,-14.33,-32,-32,-32h-56v-40h304v40h-56c-17.67,0,-32,14.33,-32,32v128c0,17.67,14.33,32,32,32h160c17.67,0,32,-14.33,32,-32V352c0,-17.67,-14.33,-32,-32,-32h-56v-40h104c8.84,0,16,-7.16,16,-16ZM256,128V64h128v64H256Zm-64,320H96v-64h96v64Zm352,0h-96v-64h96v64Z" style="fill:#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 640 512"  xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet"><rect id="svgEditorBackground" x="0" y="0" width="640" height="512" style="fill:none;stroke:none"/>
+    <path d="M640,264v-16c0,-8.84,-7.16,-16,-16,-16H344v-40h72c17.67,0,32,-14.33,32,-32V32c0,-17.67,-14.33,-32,-32,-32H224c-17.67,0,-32,14.33,-32,32v128c0,17.67,14.33,32,32,32h72v40H16c-8.84,0,-16,7.16,-16,16v16c0,8.84,7.16,16,16,16h104v40H64c-17.67,0,-32,14.33,-32,32v128c0,17.67,14.33,32,32,32h160c17.67,0,32,-14.33,32,-32V352c0,-17.67,-14.33,-32,-32,-32h-56v-40h304v40h-56c-17.67,0,-32,14.33,-32,32v128c0,17.67,14.33,32,32,32h160c17.67,0,32,-14.33,32,-32V352c0,-17.67,-14.33,-32,-32,-32h-56v-40h104c8.84,0,16,-7.16,16,-16ZM256,128V64h128v64H256Zm-64,320H96v-64h96v64Zm352,0h-96v-64h96v64Z" style="fill:white;"/>
+</svg>

PVEDiscordDark/images/dd_icon-sdn.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="142" height="140" preserveAspectRatio="xMinYMin meet" version="1.2" viewBox="0 0 142 140"><rect id="svgEditorBackground" width="142" height="140" x="0" y="0" style="fill:none;stroke:none"/><style>.a,.b{stroke:#fff}.b{fill:none;stroke-width:6}</style><circle cx="68.9" cy="66.9" r="18" class="a" style="fill:#fff"/><circle cx="120" cy="98.1" r="18" class="a" style="fill:#fff"/><path d="m84.5 76.4c6.4 3.9 13.7 8.3 20 12.2" class="b"/><circle cx="69.8" cy="118.3" r="18" class="a" style="fill:#fff"/><path d="m69.2 85.2c0.1 4.8 0.2 10 0.3 14.9" class="b"/><circle cx="22" cy="85.2" r="18" class="a" style="fill:#fff"/><path d="m52 73.5c-4.2 1.6-8.7 3.4-13 5" class="b"/><circle cx="105.4" cy="21.9" r="18" class="a" style="fill:#fff"/><path d="m80.5,52.7c4.3,-5.4,9.3,-11.5,13.6,-16.8" class="b"/><path d="m103.3 104.8c-5.4 2.2-11.3 4.6-16.7 6.7" class="b"/><path d="m36.8 95.5c5.7 3.9 12.2 8.4 18 12.4" class="b"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.2" viewBox="0 0 142 140" width="142" height="140"  xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMinYMin meet"><rect id="svgEditorBackground" x="0" y="0" width="142" height="140" style="fill:none;stroke:none"/><style>.a{stroke:rgb(255,255,255)}.b{fill:none;stroke:rgb(255,255,255);stroke-width:6}</style><circle class="a" cx="68.9" cy="66.9" r="18" style="fill:white"/><circle class="a" cx="120" cy="98.1" r="18" style="fill:white"/><path class="b" d="m84.5 76.4c6.4 3.9 13.7 8.3 20 12.2"/><circle class="a" cx="69.8" cy="118.3" r="18" style="fill:white"/><path class="b" d="m69.2 85.2c0.1 4.8 0.2 10 0.3 14.9"/><circle class="a" cx="22" cy="85.2" r="18" style="fill:white"/><path class="b" d="m52 73.5c-4.2 1.6-8.7 3.4-13 5"/><circle class="a" cx="105.4" cy="21.9" r="18" style="fill:white"/><path class="b" d="m80.5,52.7c4.3,-5.4,9.3,-11.5,13.6,-16.8"/><path class="b" d="m103.3 104.8c-5.4 2.2-11.3 4.6-16.7 6.7"/><path class="b" d="m36.8 95.5c5.7 3.9 12.2 8.4 18 12.4"/></svg>

PVEDiscordDark/images/dd_loading.svg

@@ -1 +1,32 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin:auto;background:0 0;display:block;shape-rendering:auto" width="200" height="200" preserveAspectRatio="xMidYMid" viewBox="0 0 100 100"><g transform="rotate(0 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="-0.8571428571428571s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g><g transform="rotate(51.42857142857143 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="-0.7142857142857143s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g><g transform="rotate(102.85714285714286 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="-0.5714285714285714s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g><g transform="rotate(154.28571428571428 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="-0.42857142857142855s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g><g transform="rotate(205.71428571428572 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="-0.2857142857142857s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g><g transform="rotate(257.14285714285717 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="-0.14285714285714285s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g><g transform="rotate(308.57142857142856 50 50)"><rect width="6" height="12" x="47" y="24" fill="#fff" rx="2.76" ry="2.76"><animate attributeName="opacity" begin="0s" dur="1s" keyTimes="0;1" repeatCount="indefinite" values="1;0"/></rect></g></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: none; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<g transform="rotate(0 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.8571428571428571s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(51.42857142857143 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.7142857142857143s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(102.85714285714286 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.5714285714285714s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(154.28571428571428 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.42857142857142855s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(205.71428571428572 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.2857142857142857s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(257.14285714285717 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="-0.14285714285714285s" repeatCount="indefinite"></animate>
+  </rect>
+</g><g transform="rotate(308.57142857142856 50 50)">
+  <rect x="47" y="24" rx="2.7600000000000002" ry="2.7600000000000002" width="6" height="12" fill="#ffffff">
+    <animate attributeName="opacity" values="1;0" keyTimes="0;1" dur="1s" begin="0s" repeatCount="indefinite"></animate>
+  </rect>
+</g>
+<!-- [ldio] generated by https://loading.io/ --></svg>

PVEDiscordDark/js/PVEDiscordDark.js

@@ -1,8 +1,8 @@
-const COLOR_DARK = '#2C2F33'
+const COLOR_DARK = '#434C5E'
-const COLOR_DARKER = '#23272a'
+const COLOR_DARKER = '#353C4A'
-const COLOR_BLURPLE = '#526DD1'
+const COLOR_BLURPLE = '#8FBCBB'
-const COLOR_YELLOW = '#faa61a'
+const COLOR_YELLOW = '#E9BC50'
-const COLOR_RED = '#ba2b2d'
+const COLOR_RED = '#992C2E'
 
 
 const swapLogo = async function() {

PVEDiscordDark/sass/_vars.sass

@@ -1,9 +1,9 @@
-$blurple: #526DD1
+$blurple: #8FBCBB
-$green: #43b581
+$green: #33A15E
-$yellow: #faa61a
+$yellow: #E9BC50
-$red: #ba2b2d
+$red: #992C2E
-$redlight: #d23d3f
+$redlight: #B94F51
-$dark: #2C2F33
+$dark: #434C5E
-$darker: #23272a
+$darker: #353C4A
-$lightGray: #666
+$light: #3D4656
-$light: #4A4D53
+//$darker: #2A2F3A

PVEDiscordDark/sass/special/_icons.sass

@@ -84,26 +84,18 @@
 
 .fa-fw.x-grid-icon-custom.fa
 	&.fa-database
-		color: $lightGray
+		color: $blurple
-		&.available
-			color: $blurple
 	&.fa-desktop
 		color: $blurple
-		&.stopped
-			color: $lightGray
 	&.fa-cube
 		color: $blurple
-		&.stopped
-			color: $lightGray
 	&.fa-file-o
 		&:before
 			color: rgba($blurple, 0.6)
 		&:after
-			color: $lightGray
+			color: $blurple
 			background: transparent
 			text-shadow: none
-	&.fa-tags
-		color: $lightGray
 
 .lxc:after
 	background: transparent !important

PVEDiscordDark/sass/special/_proxmox.sass

@@ -1,5 +1,5 @@
 .proxmox-invalid-row
-	background-color: #401314
+	background-color: #57191A
 
 .usage
 	background-color: $blurple

PVEDiscordDark/sass/special/_specific.sass

@@ -3,7 +3,7 @@
 
 #button-1030
 	background: $darker
-	border: 1px solid #d23d3f
+	border: 1px solid #B94F51
 
 #menuitem-1030-iconEl
 	color: white
@@ -15,7 +15,7 @@
 	color: white
 
 #menuitem-1034-iconEl
-	color: #c52d2f
+	color: #992C2E
 
 [id^="pveNodeStatus"]
 	background: $darker
@@ -87,7 +87,7 @@ a[id^="menuitem-"][id$="-itemEl"] div[class*="fa-trash-o"]:before
 // Userinfo button specifics
 #userinfo.x-btn
 	background-color: transparent !important
-	border: 1px solid #d23d3f !important
+	border: 1px solid #B94F51 !important
 div[id="menu-1029-targetEl"] > div[class*="x-menu-item"]
 	background: $dark
 div[id="menu-1029-targetEl"] > div[class*="x-menu-item"] > a[class*="x-menu-item-focus"]

PVEDiscordDark/sass/x/_tree.sass

@@ -31,29 +31,25 @@
 			color: $blurple !important
 	&.x-tree-icon-leaf.fa
 		&.fa-cube
-			color: $lightGray !important
+			color: $blurple !important
 			&.running
 				color: $blurple !important
 		&.fa-fw.fa-unlock
 			color: white
 		&.fa-desktop
 			color: $blurple !important
-			&.stopped
-				color: $lightGray !important
 		&.fa-database
 			color: $blurple !important
 		&.fa-file-o
 			&:before
 				color: rgba($blurple, 0.6)
 			&:after
-				color: $lightGray
+				color: $blurple
 				background: transparent
 				text-shadow: none
 		&.fa-building.online
 			&:before
 				color: $blurple
-		&.fa-tags
-			color: $lightGray !important
 	&.lock-migrate:after
 		color: $yellow
 

README.md

@@ -10,7 +10,7 @@
 The theme now runs its own JavaScript code which patches the colors for certain components (and charts). This approach is much better, and safer than what was used previously.
 
 ## Installation 
-The installation is done via the CLI utility. Run the following commands on the PVE node serving the Web UI:  Clearing browser cache is necessary to see the changes.
+The installation is done via the CLI utility. Run the following commands on the PVE node serving the Web UI:
 
 ```
 ~# wget https://raw.githubusercontent.com/Weilbyte/PVEDiscordDark/master/PVEDiscordDark.sh
@@ -21,10 +21,9 @@ Or this oneliner
 bash <(curl -s https://raw.githubusercontent.com/Weilbyte/PVEDiscordDark/master/PVEDiscordDark.sh ) install
 ```
 
-Note that you will need to run the install command every time `pve-manager` is updated (i.e. after every Proxmox update)
 
 ## Uninstallation
- To uninstall the theme, simply run the utility with the `uninstall` command. Clearing browser cache is necessary to see the changes.
+ To uninstall the theme, simply run the utility with the `uninstall` command.
  
 ## Installer & Security
 The new installer relies on the `/meta/supported` and `/meta/imagelist` files being present in the repository. It also includes a silent mode. Run `bash PVEDiscordDark.sh -h` for usage instructions. 
@@ -40,12 +39,7 @@ The `offline` folder must have the following files: `meta/[imagelist, supported]
 
 You can find a zip containing the installer and offline folder under the artifact section of the GitHub Actions under this repository or as an asset attached to releases.
 
-## Contributors
+## Notes
-Thanks to everybody who contributed to this project, and additional thanks to [Crinisus](https://github.com/crinisus) for catching bugs for the rewrite!
+Thanks to [jonasled](https://github.com/jonasled) for helping out with the old version, and thanks to [SmallEngineMechanic](https://github.com/smallenginemechanic) for catching bugs for the rewrite!
-
-<a href="https://github.com/weilbyte/pvediscorddark/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=weilbyte/pvediscorddark" />
-</a>
-
 
 *Awoo'ing on this repo is encouraged.*