[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] Remove unnecessary side-column divs (and background color) that were...

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


Commits:
212e6f76 by Gary Cunningham-Lee at 2026-03-26T12:21:48+09:00
[FIX][UI] Remove unnecessary side-column divs (and background color) that were...
---
* [FIX][UI] Remove unnecessary side-column divs (and background color) that were removed earlier in commit 3da6c0d4 but were unintentionally restored.

See merge request tikiwiki/tiki!9856

- - - - -


3 changed files:

- templates/layouts/basic/layout_view.tpl
- templates/layouts/classic/layout_view.tpl
- templates/layouts/social/layout_view.tpl


Changes:

=====================================
templates/layouts/basic/layout_view.tpl
=====================================
@@ -83,12 +83,10 @@
                 {/if}
             </div>
             <div class="col col3 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if}" id="col3">
-                <div class="p-1 bg-light">
-                    {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                        {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
-                    {/if}
-                    {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
-                </div>
+                {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                    {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+                {/if}
+                {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
             </div>
         </div>
         {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'}
@@ -123,12 +121,10 @@
                 {/if}
             </div>
             <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2">
-                <div class="p-1 bg-light">
-                    {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                        {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
-                    {/if}
-                    {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
-                </div>
+                {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                    {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+                {/if}
+                {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
             </div>
         {else}
             <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1">
@@ -170,20 +166,16 @@
                 {/if}
             </div>
             <div class="col col2 col-12 col-md-6 col-lg-2 order-md-2 order-lg-1" id="col2">
-                <div class="p-1 bg-light">
-                    {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                        {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
-                    {/if}
-                    {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
-                </div>
-            </div>
+                {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                    {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+                {/if}
+                {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
+             </div>
             <div class="col col3 col-12 col-md-6 col-lg-2 order-md-3" id="col3">
-                <div class="p-1 bg-light">
-                    {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                        {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
-                    {/if}
-                    {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
-                </div>
+                {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                    {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+                {/if}
+                {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
             </div>
         {/if}
     </div>


=====================================
templates/layouts/classic/layout_view.tpl
=====================================
@@ -94,12 +94,10 @@
                         {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
                     </div>
                     <div class="col col3 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if}" id="col3">
-                        <div class="p-1 bg-light">
-                            {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                                {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
-                            {/if}
-                            {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
-                        </div>
+                        {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                            {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+                        {/if}
+                        {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
                     </div>
                 {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'}
                     <div class="col col1 col-md-12 col-lg-9 {if $prefs.feature_fixed_width neq 'y'}col-xl-10{/if} order-md-1 order-lg-2 pb-4" id="col1">
@@ -136,12 +134,10 @@
                     </div>
                     {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
                     <div class="col col2 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2">
-                        <div class="p-1 bg-light">
-                            {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                                {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
-                            {/if}
-                            {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
-                        </div>
+                        {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                            {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+                        {/if}
+                        {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
                     </div>
                 {else}
                     <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1">
@@ -185,20 +181,16 @@
                             {if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
                     </div>
                     <div class="col col2 col-12 col-md-6 col-lg-2 order-md-2 order-lg-1" id="col2">
-                        <div class="p-1 bg-light">
-                            {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                                {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
-                            {/if}
-                            {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
-                        </div>
+                        {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                            {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+                        {/if}
+                        {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
                     </div>
                     <div class="col col3 col-12 col-md-6 col-lg-2 order-md-3" id="col3">
-                        <div class="p-1 bg-light">
-                            {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                                {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
-                            {/if}
-                            {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
-                        </div>
+                        {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                            {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+                        {/if}
+                        {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
                     </div>
                 {/if}
             </div> {* row row-middle *}


=====================================
templates/layouts/social/layout_view.tpl
=====================================
@@ -109,12 +109,10 @@
                         {/if}
                     </div>
                     <div class="col col3 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if}" id="col3">
-                        <div class="p-1 bg-light">
-                            {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                                {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
-                            {/if}
-                            {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
-                        </div>
+                        {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                            {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+                        {/if}
+                        {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
                     </div>
                 </div>
                     {elseif zone_is_empty('right') or $prefs.feature_right_column eq 'n'}
@@ -149,12 +147,10 @@
                         {/if}
                     </div>
                     <div class="col col2 col-12 col-md-6 col-lg-3 {if $prefs.feature_fixed_width neq 'y'}col-xl-2{/if} order-sm-2 order-md-2 order-lg-1" id="col2">
-                        <div class="p-1 bg-light">
-                            {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                                {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
-                            {/if}
-                            {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
-                        </div>
+                        {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                            {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+                        {/if}
+                        {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
                     </div>
                 {else}
             <div class="col col1 col-sm-12 col-lg-8 order-xs-1 order-lg-2 pb-4" id="col1">
@@ -196,20 +192,16 @@
                 {/if}
             </div>
             <div class="col col2 col-12 col-md-6 col-lg-2 order-md-2 order-lg-1" id="col2">
-                <div class="p-1 bg-light">
-                    {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                        {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
-                    {/if}
-                    {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
-                </div>
+                {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                    {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='left'}
+                {/if}
+                {modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
             </div>
             <div class="col col3 col-12 col-md-6 col-lg-2 order-md-3" id="col3">
-                <div class="p-1 bg-light">
-                    {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
-                        {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
-                    {/if}
-                    {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
-                </div>
+                {if $prefs.module_sidebar_toggle_small_screen eq 'y'}
+                    {include file="modules/mod-side_col_toggle_small_screen.tpl" zone='right'}
+                {/if}
+                {modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
             </div>
                 {/if}
             </div> {* row *}



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/212e6f76e18786f69dcb5d6ebfa892ee8a775346

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