Merge pull request #1684 from pixelfed/staging

Update components, change admin badge

public/mix-manifest.json

@@ -18,10 +18,10 @@
     "/js/hashtag.js": "/js/hashtag.js?id=1e5990f89b6bfe7e037b",
     "/js/loops.js": "/js/loops.js?id=9c31302552d789d5f35b",
     "/js/mode-dot.js": "/js/mode-dot.js?id=993d7fee684361edddbc",
-    "/js/profile.js": "/js/profile.js?id=c0d5f349300590fefc8a",
+    "/js/profile.js": "/js/profile.js?id=1f24f1dbdfbf2c6477c4",
     "/js/quill.js": "/js/quill.js?id=1ab4119a62cc484034d9",
     "/js/search.js": "/js/search.js?id=f312959df65e86a307a3",
-    "/js/status.js": "/js/status.js?id=0857ea680bd2eb9c0b05",
+    "/js/status.js": "/js/status.js?id=618fd650c3267f7adf3d",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=700e5dc735365e184e41",
-    "/js/timeline.js": "/js/timeline.js?id=d8650e1b8a63fd491ccd"
+    "/js/timeline.js": "/js/timeline.js?id=9ae2bfc12ab58a87923b"
 }

resources/assets/js/components/PostComponent.vue

@@ -21,8 +21,8 @@
             <div class="username">
               <span class="username-link font-weight-bold text-dark cursor-pointer" @click="redirect(statusProfileUrl)">{{ statusUsername }}</span>
               <span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
-                <i class="fas fa-certificate text-primary fa-stack-1x"></i>
-                <i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+                <i class="fas fa-certificate text-danger fa-stack-1x"></i>
+                <i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
               </span>
               <p v-if="loaded && status.place != null" class="small mb-0 cursor-pointer text-truncate" style="color:#718096" @click="redirect('/discover/places/' + status.place.id + '/' + status.place.slug)">{{status.place.name}}, {{status.place.country}}</p>
             </div>
@@ -86,8 +86,8 @@
                 <div class="username">
                   <span class="username-link font-weight-bold text-dark cursor-pointer" @click="redirect(statusProfileUrl)">{{ statusUsername }}</span>
                   <span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
-                    <i class="fas fa-certificate text-primary fa-stack-1x"></i>
-                    <i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+                    <i class="fas fa-certificate text-danger fa-stack-1x"></i>
+                    <i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
                   </span>
                   <p v-if="loaded && status.place != null" class="small mb-0 cursor-pointer text-truncate" style="color:#718096" @click="redirect('/discover/places/' + status.place.id + '/' + status.place.slug)">{{status.place.name}}, {{status.place.country}}</p>
                 </div>

resources/assets/js/components/Profile.vue

@@ -87,8 +87,8 @@
 								<div class="d-none d-md-flex username-bar pb-3 align-items-center">
 									<span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span>
 									<span class="pl-1 pb-2 fa-stack" v-if="profile.is_admin" title="Admin Account" data-toggle="tooltip">
-										<i class="fas fa-certificate fa-lg text-primary fa-stack-1x"></i>
-										<i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:9px;"></i>
+										<i class="fas fa-certificate fa-lg text-danger fa-stack-1x"></i>
+										<i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:9px;"></i>
 									</span>
 									<span v-if="profile.id != user.id && user.hasOwnProperty('id')">
 										<span class="pl-4" v-if="relationship.following == true">

resources/assets/js/components/Timeline.vue

@@ -76,8 +76,8 @@
 									{{status.account.username}}
 								</a>
 								<span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
-									<i class="fas fa-certificate text-primary fa-stack-1x"></i>
-									<i class="fas fa-check text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+									<i class="fas fa-certificate text-danger fa-stack-1x"></i>
+									<i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
 								</span>
 								<span v-if="scope != 'home' && status.account.id != profile.id && status.account.relationship">
 									<span class="px-1">•</span>