From 59551ece31dede539d893e020c59a67b40f7ecdc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 30 Mar 2019 00:43:38 +0100
Subject: [Glitch] Fix search in web UI not setting a limit, restore limit of
 10

Port 379c3e237fd271b91073f4b4a4a1626e84a7250f to glitch-soc, but changing
the 5 limit to 10, since that's what we had previously
---
 app/javascript/flavours/glitch/actions/search.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/javascript/flavours/glitch')

diff --git a/app/javascript/flavours/glitch/actions/search.js b/app/javascript/flavours/glitch/actions/search.js
index bc094eed5..b2d24e10b 100644
--- a/app/javascript/flavours/glitch/actions/search.js
+++ b/app/javascript/flavours/glitch/actions/search.js
@@ -37,6 +37,7 @@ export function submitSearch() {
       params: {
         q: value,
         resolve: true,
+        limit: 10,
       },
     }).then(response => {
       if (response.data.accounts) {
-- 
cgit 


From b9b472d519acc83f231b87c8e9287aecf9720f62 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 30 Mar 2019 01:13:19 +0100
Subject: [Glitch] Fix transparent avatars showing underlying elements in
 avatar stack and profile

Port 79227d153b86144e9a8cc73f1d4045973eabc9ef to glitch-soc
---
 app/javascript/flavours/glitch/styles/_mixins.scss             | 1 -
 app/javascript/flavours/glitch/styles/components/accounts.scss | 1 +
 app/javascript/flavours/glitch/styles/widgets.scss             | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/javascript/flavours/glitch')

diff --git a/app/javascript/flavours/glitch/styles/_mixins.scss b/app/javascript/flavours/glitch/styles/_mixins.scss
index 586802185..d542b1083 100644
--- a/app/javascript/flavours/glitch/styles/_mixins.scss
+++ b/app/javascript/flavours/glitch/styles/_mixins.scss
@@ -1,6 +1,5 @@
 @mixin avatar-radius() {
   border-radius: $ui-avatar-border-size;
-  background: transparent no-repeat;
   background-position: 50%;
   background-clip: padding-box;
 }
diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss
index 0daef4d35..00380c575 100644
--- a/app/javascript/flavours/glitch/styles/components/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/components/accounts.scss
@@ -550,6 +550,7 @@
       margin-left: -2px;
 
       .account__avatar {
+        background: darken($ui-base-color, 8%);
         border: 2px solid lighten($ui-base-color, 4%);
       }
     }
diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss
index 645192ea4..307e509d5 100644
--- a/app/javascript/flavours/glitch/styles/widgets.scss
+++ b/app/javascript/flavours/glitch/styles/widgets.scss
@@ -352,6 +352,7 @@
     border-radius: 50%;
     position: relative;
     margin-left: -10px;
+    background: darken($ui-base-color, 8%);
     border: 2px solid $ui-base-color;
 
     &:nth-child(1) {
-- 
cgit