render headline-specific toolbar on the client

6 files changed, 23 insertions, 6 deletions

diff --git a/themes/compact.css b/themes/compact.css
index 24380d428..6e4f59c84 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -704,6 +704,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -713,7 +715,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/compact_night.css b/themes/compact_night.css
index a366404a4..7dd4c0b0e 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -704,6 +704,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -713,7 +715,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/light.css b/themes/light.css
index d3f5d7978..6f70862d6 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -704,6 +704,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -713,7 +715,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index d13ffff3e..4632997ba 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -820,6 +820,8 @@ body.ttrss_main {
 			}
 
 			#toolbar-headlines {
+				font-size : 12px;
+				background: transparent;
 				padding-right : 4px;
 				flex-grow : 2;
 				display : flex;
@@ -829,7 +831,7 @@ body.ttrss_main {
 					display : flex;
 					align-items : center;
 
-					#feed_title {
+					.feed_title, .cancel_search {
 						margin-left : 4px;
 					}
 				}
diff --git a/themes/night.css b/themes/night.css
index 87a68a3c0..579f6dcdf 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -705,6 +705,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -714,7 +716,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 02a66656b..3697cff05 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -705,6 +705,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -714,7 +716,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {