From fef42f4eee0fe9d9fd21f956fa6d1fc6275301db Mon Sep 17 00:00:00 2001
From: Rafael Oliveira Pereira <rafa.oliveirap@gmail.com>
Date: Thu, 7 Jan 2021 22:17:02 -0300
Subject: [PATCH 1/2] Fixes #24450 by making the icon grey only on hover and
 white otherwise.

Signed-off-by: Rafael Oliveira Pereira <rafa.oliveirap@gmail.com>
---
 apps/settings/css/settings.scss                          | 4 +++-
 .../templates/settings/personal/development.notice.php   | 2 +-
 apps/theming/css/theming.scss                            | 6 +++++-
 core/css/icons.scss                                      | 2 ++
 core/img/filetypes/text-white.svg                        | 9 +++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 core/img/filetypes/text-white.svg

diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
index cc798868c53b4..2e1219636928b 100644
--- a/apps/settings/css/settings.scss
+++ b/apps/settings/css/settings.scss
@@ -184,7 +184,9 @@ select {
 		border-color: var(--color-primary) !important;
 	}
 
-	&.icon-file {
+	&.icon-file,
+	&.icon-file-white
+	{
 		padding-left: 48px;
 		background-position: 24px;
 	}
diff --git a/apps/settings/templates/settings/personal/development.notice.php b/apps/settings/templates/settings/personal/development.notice.php
index bed534b2d5f43..8378e57b2f7c6 100644
--- a/apps/settings/templates/settings/personal/development.notice.php
+++ b/apps/settings/templates/settings/personal/development.notice.php
@@ -1,6 +1,6 @@
 <div class="section development-notice">
 	<p>
-		<a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button icon-file" target="_blank"><?php p($l->t('Reasons to use Nextcloud in your organization'));?></a>
+		<a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button icon-file-white" target="_blank"><?php p($l->t('Reasons to use Nextcloud in your organization'));?></a>
 	</p>
 	<p>
 		<?php print_unescaped(str_replace(
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index dcc6fbee20c2c..b351fe3911df1 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -92,10 +92,14 @@ $invert: luma($color-primary) > 0.6;
 }
 
 /* Colorized svg images */
-.icon-file, .icon-filetype-text {
+.icon-file, .icon-filetype-text, .icon-file-white:hover {
 	background-image: url(./img/core/filetypes/text.svg?v=#{$theming-cachebuster});
 }
 
+.icon-file-white, .icon-filetype-text-white {
+	background-image: url(./img/core/filetypes/text-white.svg?v=#{$theming-cachebuster});
+}
+
 .icon-folder, .icon-filetype-folder {
 	background-image: url(./img/core/filetypes/folder.svg?v=#{$theming-cachebuster});
 }
diff --git a/core/css/icons.scss b/core/css/icons.scss
index b3ef33e9fa598..b896d1a65e589 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -384,6 +384,8 @@ audio, canvas, embed, iframe, img, input, object, video {
 }
 
 .icon-file,
+.icon-file-white,
+.icon-filetype-text,
 .icon-filetype-text {
 	@include icon-color('text', 'filetypes', #969696, 1, true);
 }
diff --git a/core/img/filetypes/text-white.svg b/core/img/filetypes/text-white.svg
new file mode 100644
index 0000000000000..404d32b25d326
--- /dev/null
+++ b/core/img/filetypes/text-white.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
+<defs/>
+<g id="layer0">
+  <path id="shape0" transform="translate(2, 1)" fill="#ffffff" d="M0.5 0C0.22 0 0 0.22 0 0.5L0 13.5C0 13.78 0.22 14 0.5 14L11.5 14C11.78 14 12 13.78 12 13.5L12 3L9 0ZM2 2L8 2L8 3L2 3ZM2 5L7 5L7 6L2 6ZM2 8L10 8L10 9L2 9ZM2 11L6 11L6 12L2 12Z"/>
+ </g>
+</svg>

From 20819397e96ce3b316506263efc9d0ee7454c9e3 Mon Sep 17 00:00:00 2001
From: Rafael Oliveira Pereira <rafa.oliveirap@gmail.com>
Date: Mon, 10 May 2021 18:17:55 -0300
Subject: [PATCH 2/2] Fixes #24450 by making the icon grey only on hover and
 white otherwise.

---
 apps/theming/css/theming.scss     | 6 +-----
 core/css/icons.scss               | 7 +++++--
 core/img/filetypes/text-white.svg | 9 ---------
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 core/img/filetypes/text-white.svg

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index b351fe3911df1..49e120479adf4 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -92,14 +92,10 @@ $invert: luma($color-primary) > 0.6;
 }
 
 /* Colorized svg images */
-.icon-file, .icon-filetype-text, .icon-file-white:hover {
+.icon-file, .icon-filetype-text, .icon-file-white:hover, .icon-file-white:focus {
 	background-image: url(./img/core/filetypes/text.svg?v=#{$theming-cachebuster});
 }
 
-.icon-file-white, .icon-filetype-text-white {
-	background-image: url(./img/core/filetypes/text-white.svg?v=#{$theming-cachebuster});
-}
-
 .icon-folder, .icon-filetype-folder {
 	background-image: url(./img/core/filetypes/folder.svg?v=#{$theming-cachebuster});
 }
diff --git a/core/css/icons.scss b/core/css/icons.scss
index b896d1a65e589..1df5ccd4609cd 100644
--- a/core/css/icons.scss
+++ b/core/css/icons.scss
@@ -384,12 +384,15 @@ audio, canvas, embed, iframe, img, input, object, video {
 }
 
 .icon-file,
-.icon-file-white,
-.icon-filetype-text,
 .icon-filetype-text {
 	@include icon-color('text', 'filetypes', #969696, 1, true);
 }
 
+.icon-file-white,
+.icon-filetype-text-white {
+	@include icon-color('text', 'filetypes', $color-white, 1, true);
+}
+
 .icon-filetype-file {
 	@include icon-color('file', 'filetypes', #969696, 1, true);
 }
diff --git a/core/img/filetypes/text-white.svg b/core/img/filetypes/text-white.svg
deleted file mode 100644
index 404d32b25d326..0000000000000
--- a/core/img/filetypes/text-white.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created using Karbon, part of Calligra: http://www.calligra.org/karbon -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12.8pt" height="12.8pt">
-<defs/>
-<g id="layer0">
-  <path id="shape0" transform="translate(2, 1)" fill="#ffffff" d="M0.5 0C0.22 0 0 0.22 0 0.5L0 13.5C0 13.78 0.22 14 0.5 14L11.5 14C11.78 14 12 13.78 12 13.5L12 3L9 0ZM2 2L8 2L8 3L2 3ZM2 5L7 5L7 6L2 6ZM2 8L10 8L10 9L2 9ZM2 11L6 11L6 12L2 12Z"/>
- </g>
-</svg>