From 7df27836867c7d80af3cc54b6052e5ee01bea387 Mon Sep 17 00:00:00 2001
From: Eliseu Amaro <mail@eliseuama.ro>
Date: Sat, 27 Nov 2021 20:45:24 +0000
Subject: [PATCH] [CSS] Fixed edit feed icon styling.

---
 public/assets/default_theme/css/base.css      | 28 +------------------
 .../assets/default_theme/css/pages/feeds.css  |  5 ++++
 public/assets/icons/edit.svg.twig             |  4 +--
 templates/cards/navigation/view.html.twig     | 10 +++++--
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/public/assets/default_theme/css/base.css b/public/assets/default_theme/css/base.css
index b24f98dfe2..3f53537666 100644
--- a/public/assets/default_theme/css/base.css
+++ b/public/assets/default_theme/css/base.css
@@ -31,7 +31,6 @@ body,html {
 
 body,input,textarea,select {
     color: var(--foreground);
-    fill: var(--foreground);
 }
 
 :link,:visited {
@@ -183,19 +182,6 @@ li {
 }
 
 @media(prefers-color-scheme:dark) {
-    /*:root {*/
-    /*    --foreground: #f0f6f6;*/
-    /*    --background-hard: #141216;*/
-    /*    --background-card: #131217;*/
-    /*    --border: #201f25;*/
-    /*    --accent: #5ddbcf;*/
-    /*    --shadow: 0 0 12px 0 #01010166;*/
-    /*    --shadow-inset-accent: inset 0 0 0 2px var(--accent);*/
-    /*    --background-checkerboard: repeating-conic-gradient(#ffffff66 0 90deg,#ffffff33 0 180deg) 0 0/40px 40px round;*/
-    /*    --gradient: linear-gradient(10deg,var(--border) 0,transparent 90%) !important;*/
-    /*    --gradient-backwards: linear-gradient(290deg,var(--border) 0,var(--background-card) 100%) !important;*/
-    /*}*/
-
     .background-image {
         background-color: var(--background-hard);
     }
@@ -207,19 +193,6 @@ li {
 }
 
 @media(prefers-color-scheme:light) {
-    /*:root {*/
-    /*    --foreground: #09090d;*/
-    /*    --background-hard: #ebebeb;*/
-    /*    --background-card: #f0f0f0;*/
-    /*    --border: #d5d5d5;*/
-    /*    --accent: #a22430;*/
-    /*    --shadow: 0 0 12px 0 #24243416;*/
-    /*    --shadow-inset-accent: inset 0 0 0 2px var(--accent);*/
-    /*    --background-checkerboard: repeating-conic-gradient(#ffffff66 0 90deg,#ffffff33 0 180deg) 0 0/40px 40px round;*/
-    /*    --gradient: linear-gradient(10deg,var(--background-hard) 0,transparent 60%) !important;*/
-    /*    --gradient-backwards: linear-gradient(290deg,var(--background-hard) 0,var(--background-card) 100%) !important;*/
-    /*}*/
-
     .background-image {
         background-color: var(--background-hard);
     }
@@ -233,6 +206,7 @@ li {
 
 .icon {
     align-self: center;
+    fill: var(--foreground);
 }
 
 .active {
diff --git a/public/assets/default_theme/css/pages/feeds.css b/public/assets/default_theme/css/pages/feeds.css
index d365bd8e35..de65d93dd4 100644
--- a/public/assets/default_theme/css/pages/feeds.css
+++ b/public/assets/default_theme/css/pages/feeds.css
@@ -342,3 +342,8 @@ embed header {
 .note-complementary a {
     font-weight: bold;
 }
+
+.edit-feed-link {
+    display: block;
+    float: right;
+}
diff --git a/public/assets/icons/edit.svg.twig b/public/assets/icons/edit.svg.twig
index 83b207dda0..4a6523f1b2 100644
--- a/public/assets/icons/edit.svg.twig
+++ b/public/assets/icons/edit.svg.twig
@@ -4,6 +4,6 @@
 <!-- MIT License -->
 
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <title>edit</title>
-  <path fill="#fff" fill-rule="evenodd" d="M11.013 1.427a1.75 1.75 0 012.474 0l1.086 1.086a1.75 1.75 0 010 2.474l-8.61 8.61c-.21.21-.47.364-.756.445l-3.251.93a.75.75 0 01-.927-.928l.929-3.25a1.75 1.75 0 01.445-.758l8.61-8.61zm1.414 1.06a.25.25 0 00-.354 0L10.811 3.75l1.439 1.44 1.263-1.263a.25.25 0 000-.354l-1.086-1.086zM11.189 6.25L9.75 4.81l-6.286 6.287a.25.25 0 00-.064.108l-.558 1.953 1.953-.558a.249.249 0 00.108-.064l6.286-6.286z"/>
+  <title>Edit</title>
+  <path d="M11.013 1.427a1.75 1.75 0 012.474 0l1.086 1.086a1.75 1.75 0 010 2.474l-8.61 8.61c-.21.21-.47.364-.756.445l-3.251.93a.75.75 0 01-.927-.928l.929-3.25a1.75 1.75 0 01.445-.758l8.61-8.61zm1.414 1.06a.25.25 0 00-.354 0L10.811 3.75l1.439 1.44 1.263-1.263a.25.25 0 000-.354l-1.086-1.086zM11.189 6.25L9.75 4.81l-6.286 6.287a.25.25 0 00-.064.108l-.558 1.953 1.953-.558a.249.249 0 00.108-.064l6.286-6.286z"/>
 </svg>
diff --git a/templates/cards/navigation/view.html.twig b/templates/cards/navigation/view.html.twig
index 134c632324..1957d67ed2 100644
--- a/templates/cards/navigation/view.html.twig
+++ b/templates/cards/navigation/view.html.twig
@@ -1,6 +1,11 @@
 {% block feeds %}
   <section class="section-widget section-widget-padded">
-    <h2 class="section-title">{{ icon('logo', 'icon icon-logo') | raw }} {{ 'Feeds' | trans }}</h2>
+    <h2 class="section-title">{{ icon('logo', 'icon icon-logo') | raw }}{{ 'Feeds' | trans }}
+    {% if app.user %}
+        {# User custom feeds #}
+        <a class="edit-feed-link" href="{{ path('edit_feeds') }}">{{ icon('edit', 'icon icon-edit-feed') | raw }}</a>
+    {% endif %}
+    </h2>
     <nav class='sec-nav' tabindex="0" title="{{ 'Navigate through each feed.' | trans }}">
       {% if not app.user %} {# Default feeds #}
         <ul>
@@ -15,8 +20,7 @@
             </a>
           </li>
         </ul>
-      {% else %} {# User custom feeds #}
-        <a href="{{ path('edit_feeds') }}">{{ icon('edit', 'icon') | raw }}</a>
+      {% else %}
         <ul>
           {% for link in get_feeds(current_actor) %}
             <li>