From d2b6fe099a223eb383c6d9e044fb5b71a14f0e23 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Wed, 12 Jan 2022 23:04:59 +0100
Subject: Improvement: menu icons (#4004)

* default icons

* icons Flat theme

* icons Swage theme

* icon gets bright when hover: Ansum theme

* icon gets bright when hover: Blue lagoon theme

* icon gets bright when hover: Origine/Origine Compact theme

* compressed SVG

* Better formated SVG/XML files

* Update bookmark-tag.svg
---
 app/Models/Themes.php                            |  3 +++
 app/layout/nav_menu.phtml                        |  6 +++---
 p/themes/Ansum/_components.scss                  |  4 ++++
 p/themes/Ansum/ansum.css                         |  5 ++++-
 p/themes/Ansum/ansum.rtl.css                     |  5 ++++-
 p/themes/BlueLagoon/BlueLagoon.css               |  4 ++++
 p/themes/BlueLagoon/BlueLagoon.rtl.css           |  4 ++++
 p/themes/Flat/icons/bookmark-tag.svg             |  3 +++
 p/themes/Flat/icons/sort-down.svg                |  3 +++
 p/themes/Flat/icons/sort-up.svg                  |  3 +++
 p/themes/Origine-compact/origine-compact.css     |  4 ++++
 p/themes/Origine-compact/origine-compact.rtl.css |  4 ++++
 p/themes/Origine/origine.css                     |  4 ++++
 p/themes/Origine/origine.rtl.css                 |  4 ++++
 p/themes/Swage/icons/bookmark-add.svg            | 10 ++++++----
 p/themes/Swage/icons/bookmark-tag.svg            |  3 +++
 p/themes/Swage/icons/sort-down.svg               |  3 +++
 p/themes/Swage/icons/sort-up.svg                 |  3 +++
 p/themes/icons/bookmark-add.svg                  | 10 +++++-----
 p/themes/icons/bookmark-tag.svg                  |  3 +++
 p/themes/icons/sort-down.svg                     |  3 +++
 p/themes/icons/sort-up.svg                       |  3 +++
 22 files changed, 80 insertions(+), 14 deletions(-)
 create mode 100644 p/themes/Flat/icons/bookmark-tag.svg
 create mode 100644 p/themes/Flat/icons/sort-down.svg
 create mode 100644 p/themes/Flat/icons/sort-up.svg
 create mode 100644 p/themes/Swage/icons/bookmark-tag.svg
 create mode 100644 p/themes/Swage/icons/sort-down.svg
 create mode 100644 p/themes/Swage/icons/sort-up.svg
 create mode 100644 p/themes/icons/bookmark-tag.svg
 create mode 100644 p/themes/icons/sort-down.svg
 create mode 100644 p/themes/icons/sort-up.svg

diff --git a/app/Models/Themes.php b/app/Models/Themes.php
index 61d62cd1b..8a0842461 100644
--- a/app/Models/Themes.php
+++ b/app/Models/Themes.php
@@ -75,6 +75,7 @@ class FreshRSS_Themes extends Minz_Model {
 			'all' => '☰',
 			'bookmark' => '★',
 			'bookmark-add' => '✚',
+			'bookmark-tag' => '🔖',
 			'category' => '☷',
 			'category-white' => '☷',
 			'close' => '❌',
@@ -100,6 +101,8 @@ class FreshRSS_Themes extends Minz_Model {
 			'refresh' => '🔃',	//↻
 			'search' => '🔍',
 			'share' => '♺',
+			'sort-down' => '↓',
+			'sort-up' => '↑',
 			'starred' => '★',
 			'stats' => '%',
 			'tag' => '⚐',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 758463420..7fa7ad7cf 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -32,7 +32,7 @@
 		<div class="dropdown">
 			<div id="dropdown-query" class="dropdown-target"></div>
 
-			<a class="dropdown-toggle btn" href="#dropdown-query"><?= _i('down') ?></a>
+			<a class="dropdown-toggle btn" href="#dropdown-query" title="<?= _t('index.menu.queries') ?>"><?= _i('bookmark-tag') ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 
@@ -208,11 +208,11 @@
 	<?php
 		if (FreshRSS_Context::$order === 'DESC') {
 			$order = 'ASC';
-			$icon = 'up';
+			$icon = 'sort-up';
 			$title = _t('index.menu.older_first');
 		} else {
 			$order = 'DESC';
-			$icon = 'down';
+			$icon = 'sort-down';
 			$title = _t('index.menu.newer_first');
 		}
 		$url_order = Minz_Request::currentRequest();
diff --git a/p/themes/Ansum/_components.scss b/p/themes/Ansum/_components.scss
index 9e78456a2..b3fae5d08 100644
--- a/p/themes/Ansum/_components.scss
+++ b/p/themes/Ansum/_components.scss
@@ -75,6 +75,10 @@
 				text-decoration: none;
 				color: $white;
 			}
+
+			.icon {
+				filter: grayscale(100%) brightness(2.5);
+			}
 		}
 
 		&[aria-checked="true"] {
diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css
index 4a565d031..5ad84e4fc 100644
--- a/p/themes/Ansum/ansum.css
+++ b/p/themes/Ansum/ansum.css
@@ -121,8 +121,8 @@ label {
 }
 
 textarea {
-	width: 360px;
 	max-width: 100%;
+	width: 360px;
 	height: 100px;
 }
 
@@ -276,6 +276,9 @@ form th {
 	text-decoration: none;
 	color: #fff;
 }
+.dropdown-menu .item:hover .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
 .dropdown-menu .item[aria-checked=true] a::before {
 	margin: 0 0 0 -14px;
 	font-weight: bold;
diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css
index f51507030..ddf70e2fc 100644
--- a/p/themes/Ansum/ansum.rtl.css
+++ b/p/themes/Ansum/ansum.rtl.css
@@ -121,8 +121,8 @@ label {
 }
 
 textarea {
-	width: 360px;
 	max-width: 100%;
+	width: 360px;
 	height: 100px;
 }
 
@@ -276,6 +276,9 @@ form th {
 	text-decoration: none;
 	color: #fff;
 }
+.dropdown-menu .item:hover .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
 .dropdown-menu .item[aria-checked=true] a::before {
 	margin: 0 -14px 0 0;
 	font-weight: bold;
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index 3540fb67c..d12559b97 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -396,6 +396,10 @@ a.btn {
 	font-weight: bold;
 }
 
+.dropdown-menu .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
+
 .dropdown-menu > .item > a,
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
diff --git a/p/themes/BlueLagoon/BlueLagoon.rtl.css b/p/themes/BlueLagoon/BlueLagoon.rtl.css
index b77d9923e..dfbc3cc84 100644
--- a/p/themes/BlueLagoon/BlueLagoon.rtl.css
+++ b/p/themes/BlueLagoon/BlueLagoon.rtl.css
@@ -396,6 +396,10 @@ a.btn {
 	font-weight: bold;
 }
 
+.dropdown-menu .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
+
 .dropdown-menu > .item > a,
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
diff --git a/p/themes/Flat/icons/bookmark-tag.svg b/p/themes/Flat/icons/bookmark-tag.svg
new file mode 100644
index 000000000..f087931c6
--- /dev/null
+++ b/p/themes/Flat/icons/bookmark-tag.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#fff" d="M4 1.5v13l4-4 4 4v-13z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/Flat/icons/sort-down.svg b/p/themes/Flat/icons/sort-down.svg
new file mode 100644
index 000000000..2db5d7963
--- /dev/null
+++ b/p/themes/Flat/icons/sort-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#fff" d="M13.984 2.817H2.016L5.008 8 8 13.183 10.992 8z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/Flat/icons/sort-up.svg b/p/themes/Flat/icons/sort-up.svg
new file mode 100644
index 000000000..7103b572f
--- /dev/null
+++ b/p/themes/Flat/icons/sort-up.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#fff" d="M13.984 13.183H2.016L5.008 8 8 2.817 10.992 8z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/Origine-compact/origine-compact.css b/p/themes/Origine-compact/origine-compact.css
index 0f4af625c..d2a1b15f8 100644
--- a/p/themes/Origine-compact/origine-compact.css
+++ b/p/themes/Origine-compact/origine-compact.css
@@ -401,6 +401,10 @@ a.btn,
 	color: #fff;
 }
 
+.dropdown-menu > .item:hover .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
diff --git a/p/themes/Origine-compact/origine-compact.rtl.css b/p/themes/Origine-compact/origine-compact.rtl.css
index a061f46f3..552abc28b 100644
--- a/p/themes/Origine-compact/origine-compact.rtl.css
+++ b/p/themes/Origine-compact/origine-compact.rtl.css
@@ -401,6 +401,10 @@ a.btn,
 	color: #fff;
 }
 
+.dropdown-menu > .item:hover .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 -14px 0 0;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 496254c83..d5a779502 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -393,6 +393,10 @@ a.btn {
 	color: #fff;
 }
 
+.dropdown-menu > .item:hover .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
diff --git a/p/themes/Origine/origine.rtl.css b/p/themes/Origine/origine.rtl.css
index 8dcde6b76..ea94b36ae 100644
--- a/p/themes/Origine/origine.rtl.css
+++ b/p/themes/Origine/origine.rtl.css
@@ -393,6 +393,10 @@ a.btn {
 	color: #fff;
 }
 
+.dropdown-menu > .item:hover .icon {
+	filter: grayscale(100%) brightness(2.5);
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 -14px 0 0;
diff --git a/p/themes/Swage/icons/bookmark-add.svg b/p/themes/Swage/icons/bookmark-add.svg
index ee23bff9b..8100c3fe1 100644
--- a/p/themes/Swage/icons/bookmark-add.svg
+++ b/p/themes/Swage/icons/bookmark-add.svg
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg enable-background="new 0 0 16 16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<style type="text/css">.st0{fill:#FFFFFF;}</style>
-<polygon class="st0" points="16 5.3 13.7 5.3 13.7 3 12 3 12 5.3 9.8 5.3 9.8 6.9 12 6.9 12 9.2 13.7 9.2 13.7 6.9 16 6.9"/>
-<path class="st0" d="M11,10.2V7.9H8.8V4.3H11V2h1.8V1.7c0-1-0.8-1.7-1.7-1.7H2.5c-1,0-1.7,0.8-1.7,1.7l0,13.9L6.8,13l6.1,2.6v-5.4 H11z"/>
-</svg>
+	<style type="text/css">
+		.st0{fill:#FFFFFF;}
+	</style>
+	<polygon class="st0" points="16 5.3 13.7 5.3 13.7 3 12 3 12 5.3 9.8 5.3 9.8 6.9 12 6.9 12 9.2 13.7 9.2 13.7 6.9 16 6.9" />
+	<path class="st0" d="M11,10.2V7.9H8.8V4.3H11V2h1.8V1.7c0-1-0.8-1.7-1.7-1.7H2.5c-1,0-1.7,0.8-1.7,1.7l0,13.9L6.8,13l6.1,2.6v-5.4 H11z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/Swage/icons/bookmark-tag.svg b/p/themes/Swage/icons/bookmark-tag.svg
new file mode 100644
index 000000000..3632d0fd4
--- /dev/null
+++ b/p/themes/Swage/icons/bookmark-tag.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 16 16">
+	<path fill="#fff" d="M12.8 1.7c0-1-.8-1.7-1.7-1.7H2.5C1.5 0 .8.8.8 1.7v13.9l6-2.6 6.1 2.6z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/Swage/icons/sort-down.svg b/p/themes/Swage/icons/sort-down.svg
new file mode 100644
index 000000000..d7ce416cf
--- /dev/null
+++ b/p/themes/Swage/icons/sort-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#fff" d="M15.798 1.349H.181L4.085 8.11l3.904 6.763 3.905-6.763z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/Swage/icons/sort-up.svg b/p/themes/Swage/icons/sort-up.svg
new file mode 100644
index 000000000..6449eff7c
--- /dev/null
+++ b/p/themes/Swage/icons/sort-up.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#fff" d="M15.798 14.874H.181L4.085 8.11 7.989 1.35l3.905 6.762z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/icons/bookmark-add.svg b/p/themes/icons/bookmark-add.svg
index 51db9c498..5c0c5e7fb 100644
--- a/p/themes/icons/bookmark-add.svg
+++ b/p/themes/icons/bookmark-add.svg
@@ -1,6 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-141.0002,-807)" fill="#bebebe">
-<path d="m143,807,0,13,4-4,4,4,0-4,0-1-2,0,0-4,2,0,0-4z"/>
-<path d="m152,810,0,2-2,0,0,2,2,0,0,2,2,0,0-2,2,0,0-2-2,0,0-2-2,0z"/>
-</g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<g fill="#666">
+		<path d="M1.5 1.5v13l4-4 4 4V10H7V5h2.5V1.5Z" />
+		<path d="M10.5 4.5v2h-2v2h2v2h2v-2h2v-2h-2v-2z" />
+	</g>
 </svg>
\ No newline at end of file
diff --git a/p/themes/icons/bookmark-tag.svg b/p/themes/icons/bookmark-tag.svg
new file mode 100644
index 000000000..b5f084a0c
--- /dev/null
+++ b/p/themes/icons/bookmark-tag.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#666" d="M4 1.5v13l4-4 4 4v-13z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/icons/sort-down.svg b/p/themes/icons/sort-down.svg
new file mode 100644
index 000000000..4471ca605
--- /dev/null
+++ b/p/themes/icons/sort-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#666" d="M13.984 2.817H2.016L5.008 8 8 13.183 10.992 8z" />
+</svg>
\ No newline at end of file
diff --git a/p/themes/icons/sort-up.svg b/p/themes/icons/sort-up.svg
new file mode 100644
index 000000000..59ae7d0b4
--- /dev/null
+++ b/p/themes/icons/sort-up.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+	<path fill="#666" d="M13.984 13.183H2.016L5.008 8 8 2.817 10.992 8z" />
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3