From bdc72e5b6332bb395db4419ea6e9f1550ec331ab Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 10 Mar 2021 11:59:52 +0300 Subject: [PATCH] fix headlines-spacer height in grid mode --- js/App.js | 5 +---- themes/compact.css | 4 ++-- themes/compact_night.css | 4 ++-- themes/light.css | 4 ++-- themes/light/tt-rss.less | 4 ++-- themes/night.css | 4 ++-- themes/night_blue.css | 4 ++-- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/js/App.js b/js/App.js index 82c84ce3c..78784f3a7 100644 --- a/js/App.js +++ b/js/App.js @@ -514,10 +514,7 @@ const App = { this.LABEL_BASE_INDEX = parseInt(params[k]); break; case "cdm_auto_catchup": - if (params[k] == 1) { - const hl = App.byId("headlines-frame"); - if (hl) hl.addClassName("auto_catchup"); - } + App.byId("headlines-frame").setAttribute("data-auto-catchup", params[k] ? "true" : "false"); break; case "hotkeys": // filter mnemonic definitions (used for help panel) from hotkeys map diff --git a/themes/compact.css b/themes/compact.css index 38761bd24..2ce06f803 100644 --- a/themes/compact.css +++ b/themes/compact.css @@ -853,8 +853,8 @@ body.ttrss_main .player:hover { background: #f5f5f5; cursor: pointer; } -body.ttrss_main #headlines-frame.auto_catchup #headlines-spacer { - height: 100%; +body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { + height: 100vh; } body.ttrss_main #headlines-spacer { margin-left: 1px; diff --git a/themes/compact_night.css b/themes/compact_night.css index 7a0433e34..bfca85611 100644 --- a/themes/compact_night.css +++ b/themes/compact_night.css @@ -853,8 +853,8 @@ body.ttrss_main .player:hover { background: #222; cursor: pointer; } -body.ttrss_main #headlines-frame.auto_catchup #headlines-spacer { - height: 100%; +body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { + height: 100vh; } body.ttrss_main #headlines-spacer { margin-left: 1px; diff --git a/themes/light.css b/themes/light.css index 9611b8a9c..e55cd23f6 100644 --- a/themes/light.css +++ b/themes/light.css @@ -853,8 +853,8 @@ body.ttrss_main .player:hover { background: #f5f5f5; cursor: pointer; } -body.ttrss_main #headlines-frame.auto_catchup #headlines-spacer { - height: 100%; +body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { + height: 100vh; } body.ttrss_main #headlines-spacer { margin-left: 1px; diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less index a7571c5cc..8735c1415 100644 --- a/themes/light/tt-rss.less +++ b/themes/light/tt-rss.less @@ -997,8 +997,8 @@ body.ttrss_main { cursor : pointer; } - #headlines-frame.auto_catchup #headlines-spacer { - height : 100%; + #headlines-frame[data-auto-catchup="true"] #headlines-spacer { + height : 100vh; } #headlines-spacer { diff --git a/themes/night.css b/themes/night.css index cdc15baf7..0cd83a564 100644 --- a/themes/night.css +++ b/themes/night.css @@ -854,8 +854,8 @@ body.ttrss_main .player:hover { background: #222; cursor: pointer; } -body.ttrss_main #headlines-frame.auto_catchup #headlines-spacer { - height: 100%; +body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { + height: 100vh; } body.ttrss_main #headlines-spacer { margin-left: 1px; diff --git a/themes/night_blue.css b/themes/night_blue.css index 4d93df9e2..4f1862aca 100644 --- a/themes/night_blue.css +++ b/themes/night_blue.css @@ -854,8 +854,8 @@ body.ttrss_main .player:hover { background: #222; cursor: pointer; } -body.ttrss_main #headlines-frame.auto_catchup #headlines-spacer { - height: 100%; +body.ttrss_main #headlines-frame[data-auto-catchup="true"] #headlines-spacer { + height: 100vh; } body.ttrss_main #headlines-spacer { margin-left: 1px;