Merge pull request #5257 from pixelfed/staging

Staging

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Update AdminUser, fix entity casting ([cb5620d4](https://github.com/pixelfed/pixelfed/commit/cb5620d4))
 - Update instance config, update network cache feed max_hours_old falloff to 90 days instead of 6 hours to allow for less active instances to have more results ([c042d135](https://github.com/pixelfed/pixelfed/commit/c042d135))
 - Update ApiV1Dot1Controller, add new single media status create endpoint ([b03f5cec](https://github.com/pixelfed/pixelfed/commit/b03f5cec))
+- Update AdminSettings component, add link to Custom CSS settings ([958daac4](https://github.com/pixelfed/pixelfed/commit/958daac4))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 

resources/assets/components/admin/AdminSettings.vue

@@ -168,9 +168,7 @@
                                                 The instance name used in titles, metadata and apis.
                                             </p>
                                         </div>
-                                    </div>
 
-                                    <div class="col-12 col-md-8">
                                         <div class="card shadow-none border card-body">
                                             <div class="form-group mb-1">
                                                 <label for="form-summary" class="font-weight-bold">Short Description</label>
@@ -199,6 +197,11 @@
                                             </p>
                                         </div>
                                     </div>
+                                    <div class="col-12 col-md-4">
+                                        <p>
+                                            <a class="btn btn-dark btn-block" href="/i/admin/settings/custom-css">Edit Custom CSS</a>
+                                        </p>
+                                    </div>
                                 </div>
                             </div>