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/))
 

public/mix-manifest.json

@@ -16,7 +16,7 @@
     "/js/profile-directory.js": "/js/profile-directory.js?id=1615064235d2acf08d84c3e3d1232d7e",
     "/js/story-compose.js": "/js/story-compose.js?id=50d723634d8d22db14d630a02774e5b7",
     "/js/direct.js": "/js/direct.js?id=2f7df211df1b62a0637ed87f2457e918",
-    "/js/admin.js": "/js/admin.js?id=0c438fd27a3e0ee99d0f2153295bcbfb",
+    "/js/admin.js": "/js/admin.js?id=fa159e0d221307ffbe6b41e02b8ae662",
     "/js/spa.js": "/js/spa.js?id=6419704bb22cea66399e3f85a8a8045e",
     "/js/stories.js": "/js/stories.js?id=f3d502fa937e5fa90d173d5d7aa64e2c",
     "/js/portfolio.js": "/js/portfolio.js?id=d53caf31d3ef87b47fbc51a31ff943f8",
@@ -60,7 +60,7 @@
     "/css/app.css": "/css/app.css?id=838b7d90a81e16b8a9adc8644237606a",
     "/css/portfolio.css": "/css/portfolio.css?id=d98e354f173c6a8b729626384dceaa90",
     "/css/admin.css": "/css/admin.css?id=20cdb9cce61b0e1bd9fb1aad30efcd2f",
-    "/css/landing.css": "/css/landing.css?id=ed64a3d176c47703b3c550a03c12f3a8",
+    "/css/landing.css": "/css/landing.css?id=589f3fa192867727925921b0f68ce022",
     "/css/spa.css": "/css/spa.css?id=041aed9a146db0e74b2cfe3ad8eaf96c",
     "/js/vendor.js": "/js/vendor.js?id=708e88525059af7dd812b5266775818b"
 }

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>