From ecd05088fa5653ab0076f1d5a9243a2ec869c0d0 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 30 Mar 2020 22:00:49 +0200 Subject: Simplify CSS remove z-index (#2861) * Simplify CSS remove z-index #fix https://github.com/FreshRSS/FreshRSS/issues/2860 Improvement of https://github.com/FreshRSS/FreshRSS/pull/2845 https://github.com/FreshRSS/FreshRSS/commit/22916d6a3ed259b5a5dca5cddb4a58433729384f#r38143737 * Fix when .nav_menu is not loaded This ability was lost with the last styling iterations --- p/themes/Alternative-Dark/template.css | 9 ++------- p/themes/Alternative-Dark/template.rtl.css | 9 ++------- p/themes/base-theme/template.css | 9 ++------- p/themes/base-theme/template.rtl.css | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/p/themes/Alternative-Dark/template.css b/p/themes/Alternative-Dark/template.css index 39d7449dd..7c98fd789 100644 --- a/p/themes/Alternative-Dark/template.css +++ b/p/themes/Alternative-Dark/template.css @@ -869,18 +869,13 @@ br { } /*=== "Load" parts */ -#stream { - position: relative; - z-index: 5; -} /* Only matches while waiting for div#stream to be received */ -#first_load:nth-last-of-type(2) { +#first_load:nth-last-of-type(1), #first_load:nth-last-of-type(2) { margin: -40px auto 0 auto; height: 40px; position: relative; - top: 250px; - z-index: 2; + top: 290px; } #load_more { diff --git a/p/themes/Alternative-Dark/template.rtl.css b/p/themes/Alternative-Dark/template.rtl.css index 9694a7f78..46fc3974e 100644 --- a/p/themes/Alternative-Dark/template.rtl.css +++ b/p/themes/Alternative-Dark/template.rtl.css @@ -869,18 +869,13 @@ br { } /*=== "Load" parts */ -#stream { - position: relative; - z-index: 5; -} /* Only matches while waiting for div#stream to be received */ -#first_load:nth-last-of-type(2) { +#first_load:nth-last-of-type(1), #first_load:nth-last-of-type(2) { margin: -40px auto 0 auto; height: 40px; position: relative; - top: 250px; - z-index: 2; + top: 290px; } #load_more { diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css index 8c7e77697..903ddf56f 100644 --- a/p/themes/base-theme/template.css +++ b/p/themes/base-theme/template.css @@ -869,18 +869,13 @@ br { } /*=== "Load" parts */ -#stream { - position: relative; - z-index: 5; -} /* Only matches while waiting for div#stream to be received */ -#first_load:nth-last-of-type(2) { +#first_load:nth-last-of-type(1), #first_load:nth-last-of-type(2) { margin: -40px auto 0 auto; height: 40px; position: relative; - top: 250px; - z-index: 2; + top: 290px; } #load_more { diff --git a/p/themes/base-theme/template.rtl.css b/p/themes/base-theme/template.rtl.css index 1ea778bee..b67d6155f 100644 --- a/p/themes/base-theme/template.rtl.css +++ b/p/themes/base-theme/template.rtl.css @@ -869,18 +869,13 @@ br { } /*=== "Load" parts */ -#stream { - position: relative; - z-index: 5; -} /* Only matches while waiting for div#stream to be received */ -#first_load:nth-last-of-type(2) { +#first_load:nth-last-of-type(1), #first_load:nth-last-of-type(2) { margin: -40px auto 0 auto; height: 40px; position: relative; - top: 250px; - z-index: 2; + top: 290px; } #load_more { -- cgit v1.2.3