Merge branch 'show-remote' into 'develop'

Show remote favicons See merge request soapbox-pub/soapbox-fe!200
2020-09-03 02:52:26 +00:00 · 2020-09-03 02:52:26 +00:00 · 2ec00b0e0c
commit 2ec00b0e0c
parent 66e36d5144 a98fadb4d4
4 changed files with 17 additions and 0 deletions
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
--- a/app/soapbox/features/status/components/detailed_status.js
+++ b/app/soapbox/features/status/components/detailed_status.js
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@ -125,3 +125,8 @@
  float: left;
  margin-right: 10px;
 }
+
+.detailed-status .status__favicon {
+  float: left;
+  margin-right: 5px;
+}
--- a/app/styles/components/status.scss
+++ b/app/styles/components/status.scss
@ -635,3 +635,15 @@ a.status-card.compact:hover {
  background-size: cover;
  background-position: center center;
 }
+
+.status__favicon {
+  width: 16px;
+  height: 16px;
+  float: right;
+  margin-right: 4px;
+
+  img {
+    width: 100%;
+    max-height: 100%;
+  }
+}