From 2843b9917133e5ed8e1adf4ffd12356459fc16e4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Feb 2021 13:08:34 +0300
Subject: [PATCH] minor filter UI layout fix
---
classes/pref/filters.php | 2 +-
js/CommonFilters.js | 8 +++-----
themes/compact.css | 1 +
themes/compact_night.css | 1 +
themes/light.css | 1 +
themes/light/tt-rss.less | 1 +
themes/night.css | 1 +
themes/night_blue.css | 1 +
8 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 9388cc8d7..fda4a6513 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -695,7 +695,7 @@ class Pref_Filters extends Handler_Protected {
$feed_ids = explode(",", clean($_REQUEST["ids"]));
print json_encode([
- "multiselect" => $this->_feed_multi_select("feed_id", $feed_ids, 'required="1" style="width : 540px; height : 300px" dojoType="fox.form.ValidationMultiSelect"')
+ "multiselect" => $this->_feed_multi_select("feed_id", $feed_ids, 'required="1" style="width : 100%; height : 300px" dojoType="fox.form.ValidationMultiSelect"')
]);
}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 5874170b8..0c138760d 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -423,8 +423,8 @@ const Filters = {
${App.FormFields.hidden_tag("method", filter_id ? "editSave" : "add")}
${App.FormFields.hidden_tag("csrf_token", App.getInitParam('csrf_token'))}
- <section>
- <input required="true" dojoType="dijit.form.ValidationTextBox" style="width : 530px"
+ <section class="horizontal">
+ <input required="true" dojoType="dijit.form.ValidationTextBox" style="width : 100%"
placeholder="${__("Title")}" name="title" value="${App.escapeHtml(filter.title)}">
</section>
@@ -496,9 +496,7 @@ const Filters = {
</div>
</div>
- <br/>
-
- <section class="narrow">
+ <section class="horizontal">
${Object.keys(options).map((name) =>
`
<fieldset class='narrow'>
diff --git a/themes/compact.css b/themes/compact.css
index 16bdcf1f0..9baf14227 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -456,6 +456,7 @@ body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px;
}
body.ttrss_main .dijitDialog header.horizontal + section,
+body.ttrss_main .dijitDialog section.horizontal,
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0;
}
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 37adf3fda..4d57208d0 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -456,6 +456,7 @@ body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px;
}
body.ttrss_main .dijitDialog header.horizontal + section,
+body.ttrss_main .dijitDialog section.horizontal,
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0;
}
diff --git a/themes/light.css b/themes/light.css
index 0f2ffc1b6..e47ee5adf 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -456,6 +456,7 @@ body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px;
}
body.ttrss_main .dijitDialog header.horizontal + section,
+body.ttrss_main .dijitDialog section.horizontal,
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0;
}
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 2794d8177..7b24c7701 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -530,6 +530,7 @@ body.ttrss_main {
}
header.horizontal + section,
+ section.horizontal,
.dlgSecHoriz + .dlgSecCont {
margin : 10px 0;
}
diff --git a/themes/night.css b/themes/night.css
index e012c92b2..8ca622d8d 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -457,6 +457,7 @@ body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px;
}
body.ttrss_main .dijitDialog header.horizontal + section,
+body.ttrss_main .dijitDialog section.horizontal,
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0;
}
diff --git a/themes/night_blue.css b/themes/night_blue.css
index b49a496e3..6d98bbb26 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -457,6 +457,7 @@ body.ttrss_main .dijitDialog .dlgSecCont {
margin: 10px 20px;
}
body.ttrss_main .dijitDialog header.horizontal + section,
+body.ttrss_main .dijitDialog section.horizontal,
body.ttrss_main .dijitDialog .dlgSecHoriz + .dlgSecCont {
margin: 10px 0;
}
--
GitLab