[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] In Bootswatch themes, the top and bottom margins on topbar modules...

Gary Cunningham-Lee pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
259b5d5f by Gary Cunningham-Lee at 2025-11-04T00:54:42+09:00
[FIX][UI] In Bootswatch themes, the top and bottom margins on topbar modules...
---
* [FIX][UI] In Bootswatch themes, the top and bottom margins on topbar modules that were added to replicate the Bootswatch style can be removed now that the module zone has top and bottom padding.

See merge request tikiwiki/tiki!8938

- - - - -


22 changed files:

- themes/cerulean/scss/_tiki-selectors.scss
- themes/cosmo/scss/_tiki-selectors.scss
- themes/cyborg/css/cyborg.scss
- themes/darkly/scss/_tiki-selectors.scss
- themes/flatly/scss/_tiki-selectors.scss
- themes/journal/css/journal.scss
- themes/litera/css/litera.scss
- themes/lumen/css/lumen.scss
- themes/lux/scss/_tiki-selectors.scss
- themes/materia/css/materia.scss
- themes/minty/scss/_tiki-selectors.scss
- themes/morph/scss/_tiki-selectors.scss
- themes/pulse/scss/_tiki-selectors.scss
- themes/quartz/scss/_tiki-selectors.scss
- themes/sandstone/scss/_tiki-selectors.scss
- themes/simplex/css/simplex.scss
- themes/sketchy/css/sketchy.scss
- themes/solar/css/solar.scss
- themes/spacelab/css/spacelab.scss
- themes/superhero/scss/_tiki-selectors.scss
- themes/united/css/united.scss
- themes/yeti/css/yeti.scss


Changes:

=====================================
themes/cerulean/scss/_tiki-selectors.scss
=====================================
@@ -34,12 +34,6 @@
 // Forms
 // Navs
 // Navbar
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Dropdowns
 // Pagination
 // Cards


=====================================
themes/cosmo/scss/_tiki-selectors.scss
=====================================
@@ -18,12 +18,6 @@
 
 // Color system
 // Body
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Links
 // Components
 // Typography


=====================================
themes/cyborg/css/cyborg.scss
=====================================
@@ -38,12 +38,6 @@
 
 // ----------------------------- Overrides and adjustments ----------------------------- //
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Added for Tiki (not sure why the variable isn't working)
 .accordion-button:not(.collapsed) { background: #222; }
 


=====================================
themes/darkly/scss/_tiki-selectors.scss
=====================================
@@ -20,12 +20,6 @@
 // Body
 body.fullscreen { background: var(--#{$prefix}body-bg); }
 
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Links
 // Components
 // Typography


=====================================
themes/flatly/scss/_tiki-selectors.scss
=====================================
@@ -26,12 +26,6 @@
 // Forms
 // Navs
 // Navbar
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
     // navbars with too many items overflows the container
 .navbar-expand .navbar-nav {
     flex-wrap: wrap;


=====================================
themes/journal/css/journal.scss
=====================================
@@ -38,12 +38,6 @@
 
 // ----------------------------- Overrides and adjustments ----------------------------- //
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .blockquote-footer { color: #757575; }
 
 .accordion-button.collapsed { color: #CE4540; background: var(--bs-body-bg); }


=====================================
themes/litera/css/litera.scss
=====================================
@@ -33,12 +33,6 @@
 
 // ----------------------------- Overrides and adjustments ----------------------------- //
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .topbar .nav-link {
     padding-top: .85rem;
     padding-bottom: .85rem;


=====================================
themes/lumen/css/lumen.scss
=====================================
@@ -38,12 +38,6 @@
 
 // ----------------------------- Overrides and adjustments ----------------------------- //
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 /* Search preferences > button */
 .tiki-admin aside.admin-nav li form .my-1 .input-group {
     overflow: hidden;


=====================================
themes/lux/scss/_tiki-selectors.scss
=====================================
@@ -42,12 +42,6 @@
     margin-right: 1rem;
 }
 
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .topbar .nav-link {
     padding-top: 1.1rem;
     padding-bottom: 1.1rem;


=====================================
themes/materia/css/materia.scss
=====================================
@@ -52,12 +52,6 @@ input[type="radio"],
     margin-top: 0;
 }
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .navbar-dark-parent .form-control::placeholder, .navbar-dark-parent .form-control:focus, .navbar-dark-parent .form-control, .navbar-dark .form-control::placeholder, .navbar-dark .form-control:focus, .navbar-dark .form-control {
     color: rgba(255, 255, 255, 0.75);
 }


=====================================
themes/minty/scss/_tiki-selectors.scss
=====================================
@@ -18,12 +18,6 @@
 
 // Color system
 // Body
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Links
 // Components
 // Typography


=====================================
themes/morph/scss/_tiki-selectors.scss
=====================================
@@ -43,11 +43,6 @@ button.dropdown-toggle + .dropdown-menu  .btn.dropdown-item {
 
 // Navs
 // Navbar
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
 
 .topbar .nav-link {
     padding-top: 1.25rem;


=====================================
themes/pulse/scss/_tiki-selectors.scss
=====================================
@@ -18,12 +18,6 @@
 
 // Color system
 // Body
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Links
 // Components
 // Typography


=====================================
themes/quartz/scss/_tiki-selectors.scss
=====================================
@@ -22,12 +22,6 @@ body {
     background-image: var(--tiki-quartz-body-bg-image);
 }
 
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .col2 .navbar,
 .col3 .navbar { padding: 0; }
 


=====================================
themes/sandstone/scss/_tiki-selectors.scss
=====================================
@@ -18,12 +18,6 @@
 
 // Color system
 // Body
-    // Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Links
 // Components
 // Typography


=====================================
themes/simplex/css/simplex.scss
=====================================
@@ -38,11 +38,6 @@
 
 // ----------------------------- Overrides and adjustments ----------------------------- //
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
 .card-body .navbar {
     border: none;
 }


=====================================
themes/sketchy/css/sketchy.scss
=====================================
@@ -78,11 +78,6 @@
     }
 }
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
 // Make links visible in dark mode
 #col2 .navbar {
     background: transparent;


=====================================
themes/solar/css/solar.scss
=====================================
@@ -38,12 +38,6 @@
     }
 }
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .invalid-feedback { --bs-form-invalid-color: #E279AC; }
 .valid-feedback { --bs-form-valid-color: #29A39B; }
 


=====================================
themes/spacelab/css/spacelab.scss
=====================================
@@ -43,11 +43,6 @@
     box-shadow: none;
 }
 
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .tiki .navbar-light.bg-light {
     border: 1px solid #d5d5d5;
     nav#topbar_modules,


=====================================
themes/superhero/scss/_tiki-selectors.scss
=====================================
@@ -20,12 +20,6 @@
 // Body
 body.fullscreen { background: $body-bg; }
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 // Links
 a.linkmodule {
     color: #BBD9F7;


=====================================
themes/united/css/united.scss
=====================================
@@ -40,12 +40,6 @@
 
 .siteloginbar_poppedup .list-unstyled li { background: none !important; }
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 [data-bs-theme=dark] {
     .btn-outline-primary {
         color: #EB6433;


=====================================
themes/yeti/css/yeti.scss
=====================================
@@ -62,12 +62,6 @@
     color: #fff;
 }
 
-// Increase navbar height to reinstate Bootswatch style
-.topbar_modules > * {
-    margin-top: .5rem;
-    margin-bottom: .5rem;
-}
-
 .blockquote-footer {
     color: #737373;
 }



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/259b5d5f81e55d2031084f1c5d6fd9e3aa4fbcd0

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/259b5d5f81e55d2031084f1c5d6fd9e3aa4fbcd0
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