diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 9388cc8d76fa56932e3a7c35d3632655bfadeb6a..fda4a65139cffbdfdd1e4a016eb54824268cf4b9 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 5874170b8bc9504e384f0f7b8928630ded89a747..0c138760d336fe8cb658dcb0b57a524d1624fde5 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 16bdcf1f05997dd9cf3870804edbd921ada2310b..9baf142279dee669d4263cf77b5fa4fa2b97d916 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 37adf3fda385faaa7432f5236cc8ff56abce611e..4d57208d061db28f3c41af0f52b57882c4cabae5 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 0f2ffc1b622fad847b9c55788f4e6d58e2b87662..e47ee5adf10d3c95aed6a78fbe1a7a04f918a873 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 2794d81775aa76d6bd94e7453a5c7ff374496973..7b24c7701319e75d4882dfff16e62f30b4f73241 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 e012c92b2a0f7949951f875a82a1df72efad61f5..8ca622d8d4feed9d6ad055a4dce77df0c40d5e20 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 b49a496e3dcdc083a26ccfc85228e69820380542..6d98bbb262bf19a54c1c41072d4680ca5273f4f9 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; }