Skip to content

A free, self-hostable news aggregator…

fix(theme): nav-bar layout and sticky behavior in Swage (#8739)

polybjorn28ab78da8609
diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css
index 6c7bdf5f0..5b9833529 100644
--- a/p/themes/Swage/swage.css
+++ b/p/themes/Swage/swage.css
@@ -749,6 +749,9 @@ main.post .drop-section li.item.feed a:hover .icon {
.header {
height: auto;
+ position: sticky;
+ top: 0;
+ z-index: 96; /* above .nav_menu (90) and .item.configure (95) */
> .item {
padding: 0;
@@ -781,7 +784,8 @@ main.post .drop-section li.item.feed a:hover .icon {
}
.item.configure {
- position: fixed;
+ position: absolute;
+ top: 0;
right: 0;
z-index: 95;
width: 35px;
@@ -957,6 +961,7 @@ main.post .drop-section li.item.feed a:hover .icon {
.nav_menu {
padding: 0 0 0 2rem;
width: 100%;
+ box-sizing: border-box;
font-size: 0;
background-color: var(--color-background-nav);
text-align: left;
@@ -1266,7 +1271,7 @@ main.global {
@media (max-width: 840px) {
body:not(.formLogin, .register) {
.header {
- .item .title {
+ .item.title {
display: none;
}
}
@@ -1289,13 +1294,17 @@ main.global {
}
#nav_menu_sort,
- #nav_menu_sort .dropdown-menu,
#nav_menu_sort .dropdown,
#toggle-order {
position: fixed;
right: 0;
}
+ #nav_menu_sort .dropdown-menu {
+ position: absolute;
+ right: 0;
+ }
+
#nav_menu_sort .dropdown-menu,
#nav_menu_read_all .dropdown-menu,
#dropdown-search-wrapper .dropdown-menu,
@@ -1381,7 +1390,6 @@ main.global {
.item.configure {
padding: 0;
- position: fixed;
> .icon {
margin-top: 5px;
@@ -1399,10 +1407,6 @@ main.global {
text-align: center;
}
- .flux:not(.current):hover .item .title {
- top: auto !important;
- }
-
.aside {
padding: 0;
width: 0;
@@ -1577,6 +1581,43 @@ main.global {
div#nav_menu_views {
right: 32px;
}
+
+ body:is(.normal, .reader, .global) {
+ .nav_menu {
+ display: flex;
+ height: auto;
+ flex-wrap: wrap;
+ align-items: center;
+ row-gap: 2px;
+ padding-right: 3rem; /* room for absolute-positioned cog */
+ }
+
+ .nav_menu .item.search {
+ position: static;
+ top: auto;
+ width: auto;
+ flex: 1 1 140px;
+ min-width: 100px;
+ margin-left: 0;
+ }
+
+ .nav_menu form#mark-read-menu,
+ .nav_menu a#actualize,
+ .nav_menu div#nav_menu_actions,
+ .nav_menu div#nav_menu_views,
+ .nav_menu a#toggle-order,
+ .nav_menu #nav_menu_sort,
+ .nav_menu #nav_menu_sort .dropdown {
+ position: static;
+ top: auto;
+ right: auto;
+ left: auto;
+ }
+
+ .item.configure {
+ right: 0;
+ }
+ }
}
@media (max-width: 410px) {
@@ -1680,3 +1721,7 @@ button.as-link {
min-height: initial;
}
}
+
+body:has(.aside:not(.visible)) .header .item.title {
+ display: none;
+}
diff --git a/p/themes/Swage/swage.rtl.css b/p/themes/Swage/swage.rtl.css
index 01c53a9aa..1919e17a1 100644
--- a/p/themes/Swage/swage.rtl.css
+++ b/p/themes/Swage/swage.rtl.css
@@ -749,6 +749,9 @@ main.post .drop-section li.item.feed a:hover .icon {
.header {
height: auto;
+ position: sticky;
+ top: 0;
+ z-index: 96; /* above .nav_menu (90) and .item.configure (95) */
> .item {
padding: 0;
@@ -781,7 +784,8 @@ main.post .drop-section li.item.feed a:hover .icon {
}
.item.configure {
- position: fixed;
+ position: absolute;
+ top: 0;
left: 0;
z-index: 95;
width: 35px;
@@ -957,6 +961,7 @@ main.post .drop-section li.item.feed a:hover .icon {
.nav_menu {
padding: 0 2rem 0 0;
width: 100%;
+ box-sizing: border-box;
font-size: 0;
background-color: var(--color-background-nav);
text-align: right;
@@ -1266,7 +1271,7 @@ main.global {
@media (max-width: 840px) {
body:not(.formLogin, .register) {
.header {
- .item .title {
+ .item.title {
display: none;
}
}
@@ -1289,13 +1294,17 @@ main.global {
}
#nav_menu_sort,
- #nav_menu_sort .dropdown-menu,
#nav_menu_sort .dropdown,
#toggle-order {
position: fixed;
left: 0;
}
+ #nav_menu_sort .dropdown-menu {
+ position: absolute;
+ left: 0;
+ }
+
#nav_menu_sort .dropdown-menu,
#nav_menu_read_all .dropdown-menu,
#dropdown-search-wrapper .dropdown-menu,
@@ -1381,7 +1390,6 @@ main.global {
.item.configure {
padding: 0;
- position: fixed;
> .icon {
margin-top: 5px;
@@ -1399,10 +1407,6 @@ main.global {
text-align: center;
}
- .flux:not(.current):hover .item .title {
- top: auto !important;
- }
-
.aside {
padding: 0;
width: 0;
@@ -1577,6 +1581,43 @@ main.global {
div#nav_menu_views {
left: 32px;
}
+
+ body:is(.normal, .reader, .global) {
+ .nav_menu {
+ display: flex;
+ height: auto;
+ flex-wrap: wrap;
+ align-items: center;
+ row-gap: 2px;
+ padding-left: 3rem; /* room for absolute-positioned cog */
+ }
+
+ .nav_menu .item.search {
+ position: static;
+ top: auto;
+ width: auto;
+ flex: 1 1 140px;
+ min-width: 100px;
+ margin-right: 0;
+ }
+
+ .nav_menu form#mark-read-menu,
+ .nav_menu a#actualize,
+ .nav_menu div#nav_menu_actions,
+ .nav_menu div#nav_menu_views,
+ .nav_menu a#toggle-order,
+ .nav_menu #nav_menu_sort,
+ .nav_menu #nav_menu_sort .dropdown {
+ position: static;
+ top: auto;
+ left: auto;
+ right: auto;
+ }
+
+ .item.configure {
+ left: 0;
+ }
+ }
}
@media (max-width: 410px) {
@@ -1680,3 +1721,7 @@ button.as-link {
min-height: initial;
}
}
+
+body:has(.aside:not(.visible)) .header .item.title {
+ display: none;
+}