[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] Restore missing fixed-top class to header element of Basic Bootstrap...
"Gary Cunningham-Lee \(--- via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <689addfd7f2aa_2cd686c584a@gitlab-sidekiq-low-urgency-cpu-bound-v2-77478c799c-748vd.mail> |
Gary Cunningham-Lee pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
ffc9331b by Gary Cunningham-Lee at 2025-08-12T15:16:12+09:00
[FIX][UI] Restore missing fixed-top class to header element of Basic Bootstrap...
---
* [FIX][UI] Restore admin top navbar light background color (my mistake), also do some consolidating and cleaning up in adminui.scss.
* [FIX][UI] Restore missing fixed-top class to header element of Basic Bootstrap (layout_social) template (and replace header's inline style with Bootstrap utility class p-0).
See merge request tikiwiki/tiki!8271
- - - - -
1 changed file:
- themes/base_files/css/feature/adminui.scss
Changes:
=====================================
themes/base_files/css/feature/adminui.scss
=====================================
@@ -72,41 +72,9 @@ body.tiki-admin {
// Color rules - To implement color-neutral CSS variable names, the selectors for the rules have to be repeated for 'light' and 'dark' options. The file size increase caused by this
// has been offset by removing rules not involving color where color classes were unnecessarily used repeatedly, one for light and one for dark.
-// Top nav light ------------------------------------------ Fixed-top position, light (background) option
-.tiki-admin header .tiki-top-nav-light {
- background: var(--tiki-admin-top-nav-bg);
- border: var(--tiki-admin-top-border); // Style and color, for example, solid black
- border-width: var(--tiki-admin-top-border-width); // For example, 1px, or 0px 0px 4px 0px
- box-shadow: var(--tiki-admin-top-box-shadow);
-}
-
-// Top links
-.tiki-admin .tiki-admin-top-nav-light .nav-item .nav-link { // Scope widened to include accordion.
- color: var(--tiki-admin-top-nav-color);
- &:hover,
- &:focus {
- color: var(--tiki-admin-top-nav-hover-color);
- }
-}
-
-// Top and aside dropdowns
-.tiki-admin .admin-navbar.tiki-admin-top-nav-light .dropdown-menu,
-.tiki-admin .tiki-admin-top-nav-light .dropdown-menu,
-.tiki-admin-aside-nav-light .dropdown-menu {
- color: var(--tiki-admin-dropdown-link-color);
- background-color: var(--tiki-admin-dropdown-bg);
- .dropdown-item:not(.active) {
- color: var(--tiki-admin-dropdown-link-color);
- &:focus,
- &:hover,
- & .active {
- color: var(--tiki-admin-dropdown-link-hover-color);
- background: var(--tiki-admin-dropdown-link-hover-bg);
- }
- }
-}
-
-// Top nav dark ------------------------------------------ Fixed-top position, dark (background) option
+// Top nav light and dark ------------------------ Fixed-top position, light and dark (background) options
+// Appropriate values for light and dark are provided by themes' _css-variables.scss files.
+.tiki.tiki-admin .tiki-top-nav-light,
.tiki.tiki-admin .tiki-top-nav-dark {
background: var(--tiki-admin-top-nav-bg);
border: var(--tiki-admin-top-border); // Style and color, for example, solid black
@@ -115,6 +83,7 @@ body.tiki-admin {
}
// Top links
+.tiki-admin .tiki-admin-top-nav-light .nav-item .nav-link,
.tiki-admin .tiki-admin-top-nav-dark .nav-item .nav-link { // Scope widened to include accordion.
color: var(--tiki-admin-top-nav-color);
&:hover,
@@ -124,6 +93,9 @@ body.tiki-admin {
}
// Top and aside dropdowns
+.tiki-admin .admin-navbar.tiki-admin-top-nav-light .dropdown-menu,
+.tiki-admin .tiki-admin-top-nav-light .dropdown-menu,
+.tiki-admin-aside-nav-light .dropdown-menu,
.tiki-admin .admin-navbar.tiki-admin-top-nav-dark .dropdown-menu,
.tiki-admin .tiki-admin-top-nav-dark .dropdown-menu,
.tiki-admin-aside-nav-dark .dropdown-menu {
@@ -140,33 +112,20 @@ body.tiki-admin {
}
}
-// Aside nav light -------------------------------------------------------
-.tiki-admin-aside-nav-light,
-.tiki-admin aside.admin-nav .bg-light {
- background: var(--tiki-admin-aside-nav-bg) !important;
-}
-.tiki-admin-aside-nav-light .nav-link {
- color: var(--tiki-admin-aside-nav-color);
- &:focus,
- &:hover {
- color: var(--tiki-admin-aside-nav-hover-color);
- background: var(--tiki-admin-aside-nav-hover-bg);
- }
-}
-.tiki-admin-aside-nav-light .admin-menu-collapser {
- background-color: var(--tiki-admin-dropdown-bg);
- color: var(--tiki-admin-dropdown-link-color);
-}
-// Aside nav dark ---------------------------------------------------------
+// Aside nav light and dark -----------------------------------------------
+.tiki-admin-aside-nav-light,
+.tiki-admin aside.admin-nav .bg-light,
.tiki-admin-aside-nav-dark,
.tiki-admin aside.admin-nav .navbar-dark {
background: var(--tiki-admin-aside-nav-bg) !important;
}
+.tiki-admin-aside-nav-light .nav-link,
.tiki-admin-aside-nav-dark .nav-link {
color: var(--tiki-admin-aside-nav-color);
+ &:focus,
&:hover {
color: var(--tiki-admin-aside-nav-hover-color);
background: var(--tiki-admin-aside-nav-hover-bg);
@@ -180,11 +139,13 @@ body.tiki-admin {
top: 0;
}
-.tiki-admin aside.admin-nav .navbar-light, .tiki-admin aside.admin-nav .navbar-dark {
+.tiki-admin aside.admin-nav .navbar-light,
+.tiki-admin aside.admin-nav .navbar-dark {
z-index: 9998;
}
-.tiki-admin .top_modules.navbar-dark-parent, .tiki-admin .top_modules.navbar-light-parent {
+.tiki-admin .top_modules.navbar-dark-parent,
+.tiki-admin .top_modules.navbar-light-parent {
z-index: 9999;
}
@@ -252,20 +213,6 @@ body.tiki-admin {
display: none;
}
-// Admin menu left
-.tiki-admin aside.admin-nav .narrow,
-.tiki-admin aside.admin-nav .narrow .admin-menu-collapser {
- width: 80px !important;
-}
-
-.tiki-admin aside.admin-nav .admin-menu-collapser a {
- width: 50px;
-}
-
-.tiki-admin aside.admin-nav .narrow .admin-menu-collapser a {
- width: 100%;
-}
-
.tiki-admin aside.admin-nav .navbar-dark.narrow .icon {
font-size: 1.1rem !important;
}
@@ -710,22 +657,6 @@ body.tiki-admin {
align-items: center;
}
-.tiki-admin aside.admin-nav .admin-menu-collapser {
- text-align: right;
- padding: 0;
-}
-
-.tiki-admin aside.admin-nav nav .admin-menu-collapser {
- width: 300px; // 268px;
- position: fixed;
- bottom: 0;
- height: 2.3rem;
-}
-
-.tiki-admin aside.admin-nav .bg-dark .admin-menu-collapser a.btn-link {
- color: var(--tiki-admin-dropdown-dark-color) !important;
-}
-
.tiki-admin .form-inline .form-check {
padding-right: .5rem;
}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ffc9331b44ff958ae2c513b24ccabd2d448982f5
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/ffc9331b44ff958ae2c513b24ccabd2d448982f5
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs