Merge branch 'dev' into enhancement/server-details

CHANGELOG.md

@@ -3,9 +3,9 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Remove webhook `custom` option from webook provider list as it's not currently an option ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/664))
 ### Tweaks
-TBD
+- Homogenize Panel logos/branding ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/666))
 ### Lang
 TBD
 <br><br>

app/frontend/static/assets/images/crafty-logo-square.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 425 425">
+<!-- Background -->
+<rect x="0" y="0" rx="105" ry="105" width="425" height="425" style="fill: #22283A"/>
+<!-- green C -->
+<path fill="hsl(160, 59%, 45%)" d="M 162.5 182.5 l 38 -15 q 0 -40 -40 -40 l -95 0 q -40 0 -40 40 l 0 90 q 0 40 40 40 l 95 0 q 40 0 40 -40 l -38 -20 l 0 28 l -100 0 l 0 -108 l 100 0 z"/>
+<!-- blue C -->
+<path fill="hsl(192, 99%, 45%)" d="M 262.5 182.5 l -38 -15 q 0 -40 40 -40 l 95 0 q 40 0 40 40 l 0 90 q 0 40 -40 40 l -95 0 q -40 0 -40 -40 l 38 -20 l 0 28 l 100 0 l 0 -108 l -100 0 z"/>
+<!-- line thing in middle of Cs -->
+<path fill="hsl(266, 71%, 57%)" d="M 142.5 191.5 q -10 0 -10 10 l 0 19 q 0 10 10 10 l 140 0 q 10 0 10 -10 l 0 -19 q 0 -10 -10 -10 z"/>
+</svg>

app/frontend/templates/panel/server_webhook_edit.html

@@ -43,8 +43,10 @@
               <form class="forms-sample" method="post" id="webhook_form"
                 action="/panel/edit_webhook?id={{ data['server_stats']['server_id']['server_id'] }}&sch_id={{ data['webhook']['id'] }}">
               {% end %}
-                <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type">
+              <select class="form-select form-control form-control-lg select-css" id="webhook_type" name="webhook_type">
+              {% if data['new_webhook'] == False %}
                 <option value="{{data['webhook']['webhook_type']}}">{{data['webhook']['webhook_type']}}</option>
+              {% end %}
                 {% for type in data['providers'] %}
                 {% if type != data['webhook']['webhook_type'] %}
                 <option value="{{type}}">{{type}}</option>