Bootstrap 3 Grid migration [#2077899]

For the grid, do you think we should just lead with the initial "col-md-" or also add in the other breakpoints by default of "col-sm-" and "col-lg-"?

Patch which follows has changes for md + sm, also with the change from the fluid row class to just row. New features have been mentioned in #1840980: [meta] Bootstrap 3.0, what did you have in mind?

Comment	File	Size	Author
#4	bootstrap-3-migrate-grid-system-2077899-4.patch	3.7 KB	heylookalive
#2	bootstrap-3-migrate-grid-system-2077899-3.patch	3.12 KB	heylookalive
#1	bootstrap-3-migrate-grid-system-2077899-2.patch	3.32 KB	heylookalive

Comments

Status	File	Size
new	bootstrap-3-migrate-grid-system-2077899-2.patch	3.32 KB

Comment #2

heylookalive commented 30 August 2013 at 15:11

Status	File	Size
new	bootstrap-3-migrate-grid-system-2077899-3.patch	3.12 KB

Argh! Caught up the screenshot change in the diff. Btw not sure how to supply a patch for an image file change, in any case the subtheme screenshot image is old and needs to be replaced with the one from the base theme.

Comment #3

markhalliwell

English

commented 3 September 2013 at 18:30

Status:

Active

» Needs work

+++ b/includes/form.inc
@@ -28,7 +28,8 @@ function bootstrap_form_search_form_alter(&$form, &$form_state) {
+  $form['basic']['keys']['#attributes']['class'][] = 'col-sm-2';

@@ -49,7 +50,8 @@ function bootstrap_form_search_block_form_alter(&$form, &$form_state) {
+  $form['search_block_form']['#attributes']['class'][] = 'col-sm-2';

+++ b/template.php
@@ -274,22 +274,22 @@ function bootstrap_process_block(&$variables, $hook) {
+      $classes = 'col-sm-12 col-md-12';
...
+      $classes = 'col-sm-9 col-md-9';
...
+      $classes = 'col-sm-6 col-md-6';

+++ b/templates/page.tpl.php
@@ -49,15 +49,15 @@
+      <aside class="col-sm-3 col-md-3" role="complementary">

@@ -82,7 +82,7 @@
+      <aside class="col-sm-3 col-md-3" role="complementary">

According to Bootstrap 2.x -> 3.0 migration, these should just be col-md-*. The extra col-sm-* is unnecessary ATM.

```
+++ b/template.php
@@ -274,22 +274,22 @@ function bootstrap_process_block(&$variables, $hook) {
   $class = FALSE;
...
-  return $class;
+  return $classes;
```
The beginning $class = FALSE wasn't changed. Also, I'm not entirely thrilled that there are multiple classes here. This function is a help function to return one class for the number of columns.

+++ b/templates/page.tpl.php
@@ -49,15 +49,15 @@
+    <section class="<?php print _bootstrap_content_col($columns); ?>">  ¶

Extra whitespace at EOL.

Comment #4

heylookalive commented 5 September 2013 at 18:20

Status:

Needs work

» Needs review

Status	File	Size
new	bootstrap-3-migrate-grid-system-2077899-4.patch	3.7 KB

Misunderstoof that classes flow up so no more multiple classes. I've gotten rid of the function that works out the content columns class as this should be in the page_preprocess anyway and means we can remove a function call from a template.

All columns on xs go full width, then from there sm has values set and flow up to md and lg.