[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [FIX][UI] Fixed box-shadow on collapsible admin side column, which was visible...
"Gary Cunningham-Lee \(--- via TikiWiki-cvs" <[email protected]> Wed, 08 Jul 2026 15:28:59 +0000
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6a4e6cbb1a95a_3819b8102749c@gitlab-sidekiq-low-urgency-cpu-bound-v2-85b7d9fd97-6s6jx.mail> |
Gary Cunningham-Lee pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki Commits: ce8fc40c by Gary Cunningham-Lee at 2026-07-09T00:18:08+09:00 [FIX][UI] Fixed box-shadow on collapsible admin side column, which was visible... --- * [FIX][UI] Fixed box-shadow on collapsible admin side column, which was visible... --- * [FIX][UI] Fixed box-shadow on collapsible admin side column, which was visible when column contents were collapsed. See merge request tikiwiki/tiki!10676 (cherry picked from commit 6fa877d4bcc556a82d2c4cd4f8f4717e519b2111) 8d8f9767 [FIX][UI] Fixed box-shadow on collapsible admin side column, which was visible... Co-authored-by: Gary Cunningham-Lee <gary_c-39LOpZwlz1/[email protected]> See merge request tikiwiki/tiki!10677 - - - - - 28 changed files: - themes/bookStacked/scss/_css-variables.scss - themes/boosted/scss/_css-variables.scss - themes/brite/scss/_css-variables.scss - themes/business/scss/_css-variables.scss - themes/cerulean/scss/_css-variables.scss - themes/cosmo/scss/_css-variables.scss - themes/darkly/scss/_css-variables.scss - themes/darkshine/scss/_css-variables.scss - themes/default/scss/_css-variables.scss - themes/feb12/scss/_css-variables.scss - themes/fivealive-lite/scss/_css-variables.scss - themes/fivealive/scss/_css-variables.scss - themes/greenvalley/scss/_css-variables.scss - themes/jqui/scss/_css-variables.scss - themes/kingdom/scss/_css-variables.scss - themes/litera/scss/_css-variables.scss - themes/lux/scss/_css-variables.scss - themes/materia/scss/_css-variables.scss - themes/minty/scss/_css-variables.scss - themes/morph/scss/_css-variables.scss - themes/pulse/scss/_css-variables.scss - themes/sandstone/scss/_css-variables.scss - themes/spacelab/scss/_css-variables.scss - themes/thenews/scss/_css-variables.scss - themes/tikinewt/scss/_css-variables.scss - themes/tuften/scss/_css-variables.scss - themes/united/scss/_css-variables.scss - themes/utopias/scss/_css-variables.scss Changes: ===================================== themes/bookStacked/scss/_css-variables.scss ===================================== @@ -130,8 +130,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/boosted/scss/_css-variables.scss ===================================== @@ -142,8 +142,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/brite/scss/_css-variables.scss ===================================== @@ -116,10 +116,17 @@ --tiki-admin-dropdown-link-hover-bg: #{$dropdown-link-hover-bg}; } +aside.admin-nav .navbar { + border: none; +} + // Improve appearance when two areas with same background color meet -//.navbar-wrapper:has(.tiki-admin-aside-nav-light) { -// box-shadow: 5px 0 10px -5px #e3e1e1; -//} +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + border-right: 2px solid #000; + box-shadow: 5px 0 10px -5px #e3e1e1; + } +} // Dark navbar minus top nav @mixin admin-nav-dark { @@ -148,6 +155,8 @@ } } + + // When color mode switch isn't active .tiki-admin-top-nav-light, // Legacy .tiki-admin .navbar-light-parent.tiki-top-nav-light, // UAB - Specificity increased to override ===================================== themes/business/scss/_css-variables.scss ===================================== @@ -110,8 +110,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/cerulean/scss/_css-variables.scss ===================================== @@ -116,8 +116,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/cosmo/scss/_css-variables.scss ===================================== @@ -110,8 +110,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/darkly/scss/_css-variables.scss ===================================== @@ -100,8 +100,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #304d6d; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #304d6d; + } } // Dark navbar ===================================== themes/darkshine/scss/_css-variables.scss ===================================== @@ -116,8 +116,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #750000; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #750000; + } } // Dark navbar minus top nav ===================================== themes/default/scss/_css-variables.scss ===================================== @@ -115,8 +115,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/feb12/scss/_css-variables.scss ===================================== @@ -111,8 +111,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/fivealive-lite/scss/_css-variables.scss ===================================== @@ -111,8 +111,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/fivealive/scss/_css-variables.scss ===================================== @@ -116,8 +116,10 @@ header.sticky-top { } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/greenvalley/scss/_css-variables.scss ===================================== @@ -119,8 +119,10 @@ $imagePath: "../images/"; } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/jqui/scss/_css-variables.scss ===================================== @@ -191,10 +191,11 @@ background: var(--tiki-jui-state-hover-bg-color) var(--tiki-jui-state-hover-bg-path-adminui) 50% 50% repeat-x; } - // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar ===================================== themes/kingdom/scss/_css-variables.scss ===================================== @@ -428,8 +428,11 @@ body:not(.tiki-admin) .tiki-top-nav-dark .sm-nav-link[aria-expanded=true] { --tiki-topbar-box-shadow: 0 2px 12px rgba(10, 37, 64, 0.2); } -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 14px -6px rgba(11, 60, 93, 0.25); +// Improve appearance when two areas with same background color meet +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 14px -6px rgba(11, 60, 93, 0.25); + } } .tiki-admin-top-nav-light, ===================================== themes/litera/scss/_css-variables.scss ===================================== @@ -113,8 +113,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/lux/scss/_css-variables.scss ===================================== @@ -109,8 +109,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/materia/scss/_css-variables.scss ===================================== @@ -112,8 +112,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/minty/scss/_css-variables.scss ===================================== @@ -91,8 +91,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav (Special treatment due to Minty's relatively light "dark" nav bg color) ===================================== themes/morph/scss/_css-variables.scss ===================================== @@ -113,8 +113,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #c9c9ca; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #c9c9ca; + } } // Dark navbar minus top nav ===================================== themes/pulse/scss/_css-variables.scss ===================================== @@ -106,8 +106,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/sandstone/scss/_css-variables.scss ===================================== @@ -121,8 +121,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/spacelab/scss/_css-variables.scss ===================================== @@ -118,8 +118,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/thenews/scss/_css-variables.scss ===================================== @@ -119,8 +119,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/tikinewt/scss/_css-variables.scss ===================================== @@ -119,10 +119,11 @@ --tiki-admin-dropdown-link-hover-bg: #{$dropdown-link-hover-bg}; } - // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/tuften/scss/_css-variables.scss ===================================== @@ -108,8 +108,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/united/scss/_css-variables.scss ===================================== @@ -113,8 +113,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav ===================================== themes/utopias/scss/_css-variables.scss ===================================== @@ -114,8 +114,10 @@ } // Improve appearance when two areas with same background color meet -.navbar-wrapper:has(.tiki-admin-aside-nav-light) { - box-shadow: 5px 0 10px -5px #e3e1e1; +@media (min-width: 992px) { + .navbar-wrapper:has(.tiki-admin-aside-nav-light, .tiki-admin-aside-nav-dark) { + box-shadow: 5px 0 10px -5px #e3e1e1; + } } // Dark navbar minus top nav View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ce8fc40ca1161057585827e07a358ef7a919d090 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ce8fc40ca1161057585827e07a358ef7a919d090 You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help _______________________________________________ TikiWiki-cvs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs