From b6f76d130600ded7f0f2cb585d8b9732e7aa1cff Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Jun 2019 15:30:06 +0200
Subject: [Glitch] Change full logo to use primary text color of the given
 theme

Port 20dda5cca0a4015a743250b4e584a3101e7675f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
---
 app/javascript/flavours/glitch/styles/about.scss      | 3 ++-
 app/javascript/flavours/glitch/styles/containers.scss | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss
index d4ead07a1..0e910693d 100644
--- a/app/javascript/flavours/glitch/styles/about.scss
+++ b/app/javascript/flavours/glitch/styles/about.scss
@@ -662,7 +662,8 @@ $small-breakpoint: 960px;
     align-items: center;
     padding: 50px;
 
-    img {
+    svg {
+      fill: $primary-text-color;
       height: 52px;
     }
 
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss
index b0c187eab..dc60dd14b 100644
--- a/app/javascript/flavours/glitch/styles/containers.scss
+++ b/app/javascript/flavours/glitch/styles/containers.scss
@@ -21,7 +21,8 @@
     justify-content: center;
     align-items: center;
 
-    img {
+    svg {
+      fill: $primary-text-color;
       height: 42px;
       margin-right: 10px;
     }
@@ -258,12 +259,13 @@
       display: block;
       padding: 15px;
 
-      img {
+      svg {
         display: block;
         height: 18px;
         width: auto;
         position: relative;
         bottom: -2px;
+        fill: $primary-text-color;
 
         @media screen and (max-width: $no-gap-breakpoint) {
           height: 20px;
-- 
cgit 


From a29ab6f1bdd13262d206e41c66dea15ed4dc3f22 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 16 Jun 2019 15:18:53 +0200
Subject: Fix composer buttons overflowing the composer box in single-column

---
 app/javascript/flavours/glitch/styles/components/composer.scss | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index 62eca49a1..c06d79ffc 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -586,6 +586,7 @@
   white-space: nowrap;
   overflow: hidden;
   justify-content: flex-end;
+  flex: 0 0 auto;
 
   & > .count {
     display: inline-block;
-- 
cgit 


From f57a0f89a8b2b894d028de8e75caddcf3a8c904e Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 16 Jun 2019 20:41:03 +0200
Subject: Fix styling of poll options on public pages in glitch flavour

---
 app/javascript/flavours/glitch/styles/polls.scss | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/app/javascript/flavours/glitch/styles/polls.scss b/app/javascript/flavours/glitch/styles/polls.scss
index 50bb45e7c..5261f17f4 100644
--- a/app/javascript/flavours/glitch/styles/polls.scss
+++ b/app/javascript/flavours/glitch/styles/polls.scss
@@ -2,6 +2,12 @@
   margin-top: 16px;
   font-size: 14px;
 
+  ul,
+  .e-content & ul {
+    margin: 0;
+    list-style: none;
+  }
+
   li {
     margin-bottom: 10px;
     position: relative;
-- 
cgit