From feead50bea46819e6c4c663fa35c5839b916d456 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Tue, 10 Aug 2021 21:57:43 +0200 Subject: [PATCH 1/7] [ticket/16833] Improve subscribe to forum or topic icons PHPBB3-16833 --- phpBB/styles/prosilver/template/navbar_footer.html | 8 ++++---- .../styles/prosilver/template/viewtopic_topic_tools.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index a2dc0713b5..fd6b76905e 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -35,11 +35,11 @@
  • {% if S_WATCHING_FORUM %} - {{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscribe-icon') }} - {{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} {% else %} - {{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} {% endif %} {{ S_WATCH_FORUM_TITLE }} diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index f1c2b73bae..60a35e616e 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -12,11 +12,11 @@
  • {% if S_WATCHING_TOPIC %} - {{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscribe-icon') }} - {{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} {% else %} - {{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} {% endif %} {S_WATCH_TOPIC_TITLE} From 55d32dc6694e557f0161c920feeff64b26527574 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 11 Aug 2021 02:30:54 +0200 Subject: [PATCH 2/7] [ticket/16833] Improve subscribe to forum or topic icons PHPBB3-16833 --- phpBB/styles/prosilver/template/navbar_footer.html | 8 ++++---- .../prosilver/template/viewtopic_topic_tools.html | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index fd6b76905e..aa6a80cc4a 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -35,11 +35,11 @@
  • {% if S_WATCHING_FORUM %} - {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} - {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} {% else %} - {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} {% endif %} {{ S_WATCH_FORUM_TITLE }} diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 60a35e616e..87c1b8629a 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -12,11 +12,11 @@
  • {% if S_WATCHING_TOPIC %} - {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} - {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} {% else %} - {{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} {% endif %} {S_WATCH_TOPIC_TITLE} @@ -25,7 +25,7 @@
  • - {{ Icon('iconify', 'mdi:bookmark-plus-outline', S_BOOKMARK_TOPIC, false) }} + {{ Icon('iconify', 'mdi:star-outline', S_BOOKMARK_TOPIC, false) }}
    • From 38f2840bded1e99127ba988ee493fc0647069450 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 11 Aug 2021 03:02:15 +0200 Subject: [PATCH 3/7] [ticket/16833] Improve subscribe to forum or topic icons PHPBB3-16833 --- phpBB/styles/prosilver/template/viewtopic_topic_tools.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 87c1b8629a..95a1b1aea9 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -25,7 +25,7 @@
  • - {{ Icon('iconify', 'mdi:star-outline', S_BOOKMARK_TOPIC, false) }} + {{ Icon('iconify', 'mdi:heart-outline', S_BOOKMARK_TOPIC, false) }}
    • From f7fa0d9247fab54d9634d45e5674253f676a12f2 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 11 Aug 2021 03:23:43 +0200 Subject: [PATCH 4/7] [ticket/16833] Improve subscribe to forum or topic icons fix bug and change icons PHPBB3-16833 --- phpBB/styles/prosilver/template/navbar_footer.html | 8 ++++---- .../styles/prosilver/template/viewtopic_topic_tools.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index aa6a80cc4a..ea8ccb0e50 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -35,11 +35,11 @@
  • {% if S_WATCHING_FORUM %} - {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} - {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon') }} {% else %} - {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon') }} {% endif %} {{ S_WATCH_FORUM_TITLE }} diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 95a1b1aea9..1a230a5fc3 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -12,11 +12,11 @@
  • {% if S_WATCHING_TOPIC %} - {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} - {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon') }} {% else %} - {{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon') }} {% endif %} {S_WATCH_TOPIC_TITLE} From 0a8a90b4403b468df82890eeaf39a20cb89354fd Mon Sep 17 00:00:00 2001 From: 3D-I Date: Wed, 11 Aug 2021 03:26:31 +0200 Subject: [PATCH 5/7] [ticket/16833] Improve subscribe to forum or topic icons remove extra space PHPBB3-16833 --- phpBB/styles/prosilver/template/navbar_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index ea8ccb0e50..8b3ca41881 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -35,7 +35,7 @@
  • {% if S_WATCHING_FORUM %} - {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon is-active') }} {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon') }} {% else %} {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon is-active') }} From e2c174a618b23de246a25a031ce1c7576c198c27 Mon Sep 17 00:00:00 2001 From: 3D-I Date: Sun, 15 Aug 2021 20:30:31 +0200 Subject: [PATCH 6/7] [ticket/16833] Improve subscribe to forum or topic icons PHPBB3-16833 --- .../prosilver/template/viewtopic_topic_tools.html | 10 +++++----- phpBB/styles/prosilver/theme/icons.css | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 1a230a5fc3..6fbcd09dbf 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -12,11 +12,11 @@
  • {% if S_WATCHING_TOPIC %} - {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon') }} {% else %} - {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon') }} {% endif %} {S_WATCH_TOPIC_TITLE} @@ -25,7 +25,7 @@
  • - {{ Icon('iconify', 'mdi:heart-outline', S_BOOKMARK_TOPIC, false) }} + {{ Icon('iconify', 'mdi:bookmark-plus-outline', S_BOOKMARK_TOPIC, false) }}
    • diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index 0edd6982d5..1ade3bb213 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -128,10 +128,10 @@ blockquote cite:before, margin-top: 0; } -.c-subscribe-icon { +.c-watch-icon { display: none !important; } -.c-subscribe-icon.is-active { +.c-watch-icon.is-active { display: inline !important; } From a6cc7f1b599ceb00501505b84f30e51d7bc5a47a Mon Sep 17 00:00:00 2001 From: 3D-I Date: Mon, 16 Aug 2021 01:27:19 +0200 Subject: [PATCH 7/7] [ticket/16833] Improve subscribe to forum or topic icons PHPBB3-16833 --- phpBB/styles/prosilver/template/navbar_footer.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 8b3ca41881..e059b7f002 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -35,11 +35,11 @@
  • {% if S_WATCHING_FORUM %} - {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon') }} {% else %} - {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-subscribe-icon is-active') }} - {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-subscribe-icon') }} + {{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon is-active') }} + {{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon') }} {% endif %} {{ S_WATCH_FORUM_TITLE }}