From 147be04b8d55463c3a9b58c4253cd40d07feef09 Mon Sep 17 00:00:00 2001 From: Sal Ferrarello Date: Tue, 8 Dec 2015 12:03:35 -0500 Subject: [PATCH 1/2] Change cols to wider on optional layouts These changes made the Bootstrap columns wider for the sidebars and narrower for the content. See #119 --- lib/bootstrap-markup-layout-options.php | 26 ++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/bootstrap-markup-layout-options.php b/lib/bootstrap-markup-layout-options.php index 3a88996..2f521ce 100755 --- a/lib/bootstrap-markup-layout-options.php +++ b/lib/bootstrap-markup-layout-options.php @@ -21,31 +21,35 @@ function bsg_layout_options_modify_classes_to_add( $classes_to_add ) { // sidebar-content // supported if ( 'sidebar-content' === $layout ) { - $classes_to_add['content'] = 'col-sm-9 col-sm-push-3'; - $classes_to_add['sidebar-primary'] = 'col-sm-3 col-sm-pull-9'; + $classes_to_add['content'] = 'col-sm-8 col-sm-push-4 col-md-9 col-md-push-3'; + $classes_to_add['sidebar-primary'] = 'col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-9'; } // content-sidebar-sidebar // supported if ( 'content-sidebar-sidebar' === $layout ) { - $classes_to_add['content'] = 'col-sm-6'; - $classes_to_add['sidebar-primary'] = 'col-sm-3'; - $classes_to_add['sidebar-secondary'] = 'col-sm-3'; + $classes_to_add['content'] = 'col-sm-4'; + $classes_to_add['sidebar-primary'] = 'col-sm-4'; + $classes_to_add['sidebar-secondary'] = 'col-sm-4'; } // sidebar-sidebar-content // supported if ( 'sidebar-sidebar-content' === $layout ) { - $classes_to_add['content'] = 'col-sm-6 col-sm-push-6'; - $classes_to_add['sidebar-primary'] = 'col-sm-3 col-sm-pull-3'; - $classes_to_add['sidebar-secondary'] = 'col-sm-3 col-sm-pull-9'; + $classes_to_add['content'] = 'col-sm-4 col-sm-push-8'; + $classes_to_add['sidebar-primary'] = 'col-sm-4'; + $classes_to_add['sidebar-secondary'] = 'col-sm-4 col-sm-pull-8'; + + // $classes_to_add['content'] = 'col-sm-6 col-sm-push-6'; + // $classes_to_add['sidebar-primary'] = 'col-sm-3 col-sm-pull-3'; + // $classes_to_add['sidebar-secondary'] = 'col-sm-3 col-sm-pull-9'; } // sidebar-content-sidebar // supported if ( 'sidebar-content-sidebar' === $layout ) { - $classes_to_add['content'] = 'col-sm-6 col-sm-push-3'; - $classes_to_add['sidebar-primary'] = 'col-sm-3 col-sm-push-3'; - $classes_to_add['sidebar-secondary'] = 'col-sm-3 col-sm-pull-9'; + $classes_to_add['content'] = 'col-sm-4 col-sm-push-4'; + $classes_to_add['sidebar-primary'] = 'col-sm-4 col-sm-push-4'; + $classes_to_add['sidebar-secondary'] = 'col-sm-4 col-sm-pull-8'; } return $classes_to_add; From fb58a45cd916cdd4e4e94c3705d4a9230f60b059 Mon Sep 17 00:00:00 2001 From: Sal Ferrarello Date: Thu, 7 Apr 2016 11:58:03 -0400 Subject: [PATCH 2/2] Modify column widths for alt layouts Based on the idea: - at the md size (and above), 3 should be the minimum number of columns - at the sm size, 4 should be the minimum number of columns - the content column should always be the maximum value supported - at the sm size when two sidebars are present, the second sidebar displays below the content and first sidebar See #119 --- lib/bootstrap-markup-layout-options.php | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/lib/bootstrap-markup-layout-options.php b/lib/bootstrap-markup-layout-options.php index 2f521ce..e1c1bcc 100755 --- a/lib/bootstrap-markup-layout-options.php +++ b/lib/bootstrap-markup-layout-options.php @@ -27,29 +27,25 @@ function bsg_layout_options_modify_classes_to_add( $classes_to_add ) { // content-sidebar-sidebar // supported if ( 'content-sidebar-sidebar' === $layout ) { - $classes_to_add['content'] = 'col-sm-4'; - $classes_to_add['sidebar-primary'] = 'col-sm-4'; - $classes_to_add['sidebar-secondary'] = 'col-sm-4'; + $classes_to_add['content'] = 'col-sm-8 col-md-6'; + $classes_to_add['sidebar-primary'] = 'col-sm-4 col-md-3'; + $classes_to_add['sidebar-secondary'] = 'col-sm-12 col-md-3'; } // sidebar-sidebar-content // supported if ( 'sidebar-sidebar-content' === $layout ) { - $classes_to_add['content'] = 'col-sm-4 col-sm-push-8'; - $classes_to_add['sidebar-primary'] = 'col-sm-4'; - $classes_to_add['sidebar-secondary'] = 'col-sm-4 col-sm-pull-8'; - - // $classes_to_add['content'] = 'col-sm-6 col-sm-push-6'; - // $classes_to_add['sidebar-primary'] = 'col-sm-3 col-sm-pull-3'; - // $classes_to_add['sidebar-secondary'] = 'col-sm-3 col-sm-pull-9'; + $classes_to_add['content'] = 'col-sm-8 col-sm-push-4 col-md-6 col-md-push-6'; + $classes_to_add['sidebar-primary'] = 'col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-3'; + $classes_to_add['sidebar-secondary'] = 'col-sm-12 col-md-3 col-md-pull-9'; } // sidebar-content-sidebar // supported if ( 'sidebar-content-sidebar' === $layout ) { - $classes_to_add['content'] = 'col-sm-4 col-sm-push-4'; - $classes_to_add['sidebar-primary'] = 'col-sm-4 col-sm-push-4'; - $classes_to_add['sidebar-secondary'] = 'col-sm-4 col-sm-pull-8'; + $classes_to_add['content'] = 'col-sm-8 col-md-6 col-md-push-3'; + $classes_to_add['sidebar-primary'] = 'col-sm-4 col-md-3 col-md-push-3'; + $classes_to_add['sidebar-secondary'] = 'col-sm-12 col-md-3 col-md-pull-9'; } return $classes_to_add;