Add row classes to fix grid layouts

app/views/group/index.html.haml

@@ -1,18 +1,19 @@
 - provide(:title, group_title(@group))
 = render 'static/mobile_nav'
 .container.j2-page
-  .col-md-3.col-sm-4
-    = render 'shared/sidebar'
-  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
-    = render 'layouts/messages'
+  .row
+    .col-md-3.col-sm-4
+      = render 'shared/sidebar'
+    .col-md-9.col-xs-12.col-sm-8.j2-col-reset
+      = render 'layouts/messages'
 
-    #timeline
-      - @timeline.each do |answer|
-        = render 'shared/answerbox', a: answer
+      #timeline
+        - @timeline.each do |answer|
+          = render 'shared/answerbox', a: answer
 
-    #pagination= will_paginate @timeline, renderer: BootstrapPagination::Rails, page_links: false
+      #pagination= will_paginate @timeline, renderer: BootstrapPagination::Rails, page_links: false
 
-    - if @timeline.next_page
-      %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @timeline.current_page }}
-        = t 'views.actions.load'
-.visible-xs= render 'shared/links'
+      - if @timeline.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @timeline.current_page }}
+          = t 'views.actions.load'
+.d-block.d-sm-none= render 'shared/links'

app/views/public/index.html.haml

@@ -1,18 +1,19 @@
 - provide(:title, generate_title("Public Timeline"))
 = render 'static/mobile_nav'
 .container.j2-page
-  .col-md-3.col-sm-4
-    = render 'shared/sidebar'
-  .col-md-9.col-xs-12.col-sm-8
-    = render 'layouts/messages'
+  .row
+    .col-md-3.col-sm-4
+      = render 'shared/sidebar'
+    .col-md-9.col-xs-12.col-sm-8
+      = render 'layouts/messages'
 
-    #timeline
-      - @timeline.each do |answer|
-        = render 'shared/answerbox', a: answer
+      #timeline
+        - @timeline.each do |answer|
+          = render 'shared/answerbox', a: answer
 
-    #pagination= will_paginate @timeline, renderer: BootstrapPagination::Rails, page_links: false
+      #pagination= will_paginate @timeline, renderer: BootstrapPagination::Rails, page_links: false
 
-    - if @timeline.next_page
-      %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @timeline.current_page }}
-        Load more
+      - if @timeline.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @timeline.current_page }}
+          Load more
 .visible-xs= render 'shared/links'

app/views/static/index.html.haml

@@ -1,17 +1,18 @@
 - provide(:title, "#{APP_CONFIG['site_name']}")
 = render 'static/mobile_nav'
 .container.j2-page
-  .col-md-3.col-sm-4
-    = render 'shared/sidebar'
-  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
-    = render 'layouts/messages'
-    #timeline
-      - @timeline.each do |answer|
-        = render 'shared/answerbox', a: answer
+  .row
+    .col-md-3.col-sm-4
+      = render 'shared/sidebar'
+    .col-md-9.col-xs-12.col-sm-8.j2-col-reset
+      = render 'layouts/messages'
+      #timeline
+        - @timeline.each do |answer|
+          = render 'shared/answerbox', a: answer
 
-    #pagination= will_paginate @timeline, renderer: BootstrapPagination::Rails, page_links: false
+      #pagination= will_paginate @timeline, renderer: BootstrapPagination::Rails, page_links: false
 
-    - if @timeline.next_page
-      %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @timeline.current_page }}
-        Load more
+      - if @timeline.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @timeline.current_page }}
+          Load more
   .visible-xs= render 'shared/links'

app/views/user/groups.html.haml

@@ -3,19 +3,20 @@
 #profile--header{class: no_header}
   %img.profile--header-img{src: @user.profile_header.url(:web)}
 .container.j2-page.headerable{class: no_header}
-  .col-md-3.col-xs-12.col-sm-4
-    = render 'user/profile_info'
-    .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8
-    %h1.j2-lh.hidden-xs Groups
-    %h1.visible-xs Groups
+  .row
+    .col-md-3.col-xs-12.col-sm-4
+      = render 'user/profile_info'
+      .hidden-xs= render 'shared/links'
+    .col-md-9.col-xs-12.col-sm-8
+      %h1.j2-lh.hidden-xs Groups
+      %h1.visible-xs Groups
 
-    %ul
-      - @groups.each do |group|
-        %li
-          - if group.private?
-            %i.fa.fa-lock
-          = group.display_name
+      %ul
+        - @groups.each do |group|
+          %li
+            - if group.private?
+              %i.fa.fa-lock
+            = group.display_name
 
   .visible-xs= render 'shared/links'
 - if user_signed_in?

app/views/user/questions.html.haml

@@ -3,19 +3,20 @@
 #profile--header{class: no_header}
   %img.profile--header-img{src: @user.profile_header.url(:web)}
 .container.j2-page.headerable{class: no_header}
-  .col-md-3.col-xs-12.col-sm-4.j2-col-reset
-    = render 'user/profile_info'
-    .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
-    %h1.j2-lh.hidden-xs= @title
-    %h1.visible-xs= @title
-    #questions
-      - @questions.each do |q|
-        = render 'shared/question', q: q, type: nil
+  .row
+    .col-md-3.col-xs-12.col-sm-4.j2-col-reset
+      = render 'user/profile_info'
+      .hidden-xs= render 'shared/links'
+    .col-md-9.col-xs-12.col-sm-8.j2-col-reset
+      %h1.j2-lh.hidden-xs= @title
+      %h1.visible-xs= @title
+      #questions
+        - @questions.each do |q|
+          = render 'shared/question', q: q, type: nil
 
-    #pagination= will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false
+      #pagination= will_paginate @questions, renderer: BootstrapPagination::Rails, page_links: false
 
-    - if @questions.next_page
-      %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @questions.current_page }}
-        = t 'views.actions.load'
+      - if @questions.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @questions.current_page }}
+          = t 'views.actions.load'
   .visible-xs= render 'shared/links'

app/views/user/show.html.haml

@@ -3,22 +3,23 @@
 #profile--header{class: no_header}
   %img.profile--header-img{src: @user.profile_header.url(:web)}
 .container.j2-page.headerable{class: no_header}
-  #profile-info.col-md-3.col-xs-12.col-sm-4.j2-col-reset
-    = render 'user/profile_info'
-    .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
-    .profile--panel-push-inner.hidden-xs{class: no_header}
-    = render 'shared/questionbox'
-    - unless @user.banned?
-      #answers
-        - @answers.each do |a|
-          = render 'shared/answerbox', a: a
+  .row
+    #profile-info.col-md-3.col-xs-12.col-sm-4.j2-col-reset
+      = render 'user/profile_info'
+      .hidden-xs= render 'shared/links'
+    .col-md-9.col-xs-12.col-sm-8.j2-col-reset
+      .profile--panel-push-inner.hidden-xs{class: no_header}
+      = render 'shared/questionbox'
+      - unless @user.banned?
+        #answers
+          - @answers.each do |a|
+            = render 'shared/answerbox', a: a
 
-      #pagination= will_paginate @answers, renderer: BootstrapPagination::Rails, page_links: false
+        #pagination= will_paginate @answers, renderer: BootstrapPagination::Rails, page_links: false
 
-      - if @answers.next_page
-        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @answers.current_page }}
-          = t 'views.actions.load'
+        - if @answers.next_page
+          %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @answers.current_page }}
+            = t 'views.actions.load'
   .visible-xs= render 'shared/links'
 - if user_signed_in?
   = render 'user/modal_group_memberships'

app/views/user/show_follow.html.haml

@@ -3,22 +3,23 @@
 #profile--header{class: no_header}
   %img.profile--header-img{src: @user.profile_header.url(:web)}
 .container.j2-page.headerable{class: no_header}
-  .col-md-3.col-xs-12.col-sm-4.j2-col-reset
-    = render 'user/profile_info'
-    .hidden-xs= render 'shared/links'
-  .col-md-9.col-xs-12.col-sm-8.j2-col-reset
-    %h1.j2-lh.hidden-xs= @title
-    %h1.visible-xs= @title
-    #users
-      - @users.each do |user|
-        .col-md-4.col-sm-6.col-xs-12
-          = render 'shared/userbox', user: user
+  .row
+    .col-md-3.col-xs-12.col-sm-4.j2-col-reset
+      = render 'user/profile_info'
+      .hidden-xs= render 'shared/links'
+    .col-md-9.col-xs-12.col-sm-8.j2-col-reset
+      %h1.j2-lh.hidden-xs= @title
+      %h1.visible-xs= @title
+      #users
+        - @users.each do |user|
+          .col-md-4.col-sm-6.col-xs-12
+            = render 'shared/userbox', user: user
 
-    #pagination= will_paginate @users, renderer: BootstrapPagination::Rails, page_links: false
+      #pagination= will_paginate @users, renderer: BootstrapPagination::Rails, page_links: false
 
-    - if @users.next_page
-      %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @users.current_page }}
-        = t 'views.actions.load'
+      - if @users.next_page
+        %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @users.current_page }}
+          = t 'views.actions.load'
   .visible-xs= render 'shared/links'
 - if user_signed_in?
   = render 'user/modal_group_memberships'