From 03ef5bd064c56e09497a50a5ffbc95db938172b7 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Sat, 6 Feb 2016 13:18:00 +0100
Subject: [PATCH] Set max-width to 1200px for container-fluid

---
 app/assets/stylesheets/base.scss                    |  7 +++++++
 app/assets/stylesheets/conversations.scss           |  9 +++++----
 app/assets/stylesheets/header.scss                  |  1 -
 app/assets/templates/header_tpl.jst.hbs             |  2 +-
 .../user_applications/index.html.haml               |  4 ++--
 .../user_applications/index.mobile.haml             |  2 +-
 app/views/conversations/index.haml                  | 13 ++++++-------
 app/views/layouts/_header.html.haml                 |  2 +-
 app/views/profiles/edit.haml                        |  4 ++--
 app/views/profiles/edit.mobile.haml                 |  4 ++--
 app/views/services/index.html.haml                  |  8 ++++----
 app/views/services/index.mobile.haml                |  6 +++---
 app/views/users/_edit.haml                          |  8 ++++----
 app/views/users/_privacy_settings.haml              |  4 ++--
 14 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
index b701adb49..dd7ed1791 100644
--- a/app/assets/stylesheets/base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -3,6 +3,13 @@ body {
   padding: none;
 }
 
+.container-fluid { max-width: $screen-lg-min; }
+
+.page-streams,
+.page-tags.action-show {
+  > .container-fluid { max-width: 100%; }
+}
+
 // Overflow
 h1,
 h2,
diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index 62e0a3fef..846abe2a9 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -191,11 +191,12 @@
   }
 }
 
-@media (max-width: 1354px) {
-  #left_pane #conversation_inbox .pagination ul > li > a {
-    padding: 4px 7px;
-  }
+// We need this to override the Bootstrap pagination style only for the conversations view
+// scss-lint:disable SelectorDepth
+.conversation-inbox .pagination > li > a {
+  padding: 4px 7px;
 }
+// scss-lint:enable SelectorDepth
 
 #new_conversation_pane {
   ul.as-selections { width: 100% !important; }
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
index 1f958d6ed..9cb3a533d 100644
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -9,7 +9,6 @@
   }
 
   @media (max-width: $grid-float-breakpoint-max) {
-    .col-lg-10 { padding: 0; }
     .navbar-header > .nav li { display: inline-block !important; }
     .nav-badge {
       color: $navbar-inverse-link-color;
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 0855fa835..15e6023ba 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-inverse navbar-fixed-top">
   <div class="container-fluid">
     <div class="row">
-      <div class="col-lg-10 col-lg-offset-1">
+      <div class="col-md-12">
         <div class="navbar-header">
           <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar-collapse">
             <span class="sr-only">{{t "header.toggle_navigation"}}</span>
diff --git a/app/views/api/openid_connect/user_applications/index.html.haml b/app/views/api/openid_connect/user_applications/index.html.haml
index ea2241b74..5fbec9219 100644
--- a/app/views/api/openid_connect/user_applications/index.html.haml
+++ b/app/views/api/openid_connect/user_applications/index.html.haml
@@ -3,10 +3,10 @@
 
 .container-fluid.applications-page
   .row
-    .col-lg-10.col-lg-offset-1
+    .col-md-12
       = render "shared/settings_nav"
   .row
-    .col-lg-8.col-lg-offset-2
+    .col-md-12
       %h3= t(".title")
       .row
         .col-md-12
diff --git a/app/views/api/openid_connect/user_applications/index.mobile.haml b/app/views/api/openid_connect/user_applications/index.mobile.haml
index 9e75a012d..39690d661 100644
--- a/app/views/api/openid_connect/user_applications/index.mobile.haml
+++ b/app/views/api/openid_connect/user_applications/index.mobile.haml
@@ -1,6 +1,6 @@
 .container-fluid.settings_container.applications-page
   .row
-    .col-lg-10.col-lg-offset-1
+    .col-md-12
       - content_for :page_title do
         = t(".edit_applications")
       = render "shared/settings_nav"
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index afd9585f0..2b04a898d 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -14,7 +14,7 @@
               = link_to t('.new_conversation'), conversations_path, class: 'btn btn-default'
             = t('.inbox')
 
-        #conversation_inbox
+        .conversation-inbox#conversation_inbox
           .stream.conversations
             - if @visibilities.count > 0
               = render partial: "conversations/conversation", collection: @visibilities, as: :visibility
@@ -34,9 +34,8 @@
       - else
         .stream_container.hidden
           #conversation_show
-        .row#conversation_new
-          .col-md-10.col-md-offset-1
-            .new-conversation
-              %h3.text-center
-                = t("conversations.index.new_conversation")
-              = render "conversations/new"
+        #conversation_new
+          .new-conversation
+            %h3.text-center
+              = t("conversations.index.new_conversation")
+            = render "conversations/new"
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index e7ee595a3..b5a82390c 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -8,7 +8,7 @@
       %nav.navbar.navbar-inverse.navbar-fixed-top
         .container-fluid
           .row
-            .col-lg-10.col-lg-offset-1
+            .col-md-12
               .navbar-header
                 %button.navbar-toggle.collapsed{type: "button", data: {toggle: "collapse", target: "#navbar-collapse"}}
                   %span.sr-only
diff --git a/app/views/profiles/edit.haml b/app/views/profiles/edit.haml
index 903134810..c05006513 100644
--- a/app/views/profiles/edit.haml
+++ b/app/views/profiles/edit.haml
@@ -4,11 +4,11 @@
 
 .container-fluid
   .row
-    .col-lg-10.col-lg-offset-1
+    .col-md-12
       = render "shared/settings_nav"
 
   .row
-    .col-lg-8.col-lg-offset-2
+    .col-md-12
       - content_for :submit_block do
         = link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
         = submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
diff --git a/app/views/profiles/edit.mobile.haml b/app/views/profiles/edit.mobile.haml
index 42c6864e9..333985f7a 100644
--- a/app/views/profiles/edit.mobile.haml
+++ b/app/views/profiles/edit.mobile.haml
@@ -4,11 +4,11 @@
 
 .settings_container.container-fluid
   .row
-    .col-lg-10.col-lg-offset-1
+    .col-md-12
       = render "shared/settings_nav"
 
   .row
-    .col-lg-8.col-lg-offset-2
+    .col-md-12
       - content_for :submit_block do
         = link_to t("cancel"), local_or_remote_person_path(current_user.person), class: "btn btn-default"
         = submit_tag t(".update_profile"), class: "btn btn-primary pull-right", id: "update_profile"
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index beca8e83a..0caff17fd 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -7,16 +7,16 @@
 
 .container-fluid
   .row
-    .col-lg-10.col-lg-offset-1
+    .col-md-12
       = render "shared/settings_nav"
 
   .row
-    .col-lg-8.col-lg-offset-2
+    .col-md-12
       %h3= t(".title")
   .row
-    .col-md-7.col-lg-5.col-lg-offset-2
+    .col-md-7
       = render "add_remove_services"
 
-    .col-md-5.col-lg-3
+    .col-md-5
       %p
         = t(".services_explanation")
diff --git a/app/views/services/index.mobile.haml b/app/views/services/index.mobile.haml
index d3204138f..a74e7167c 100644
--- a/app/views/services/index.mobile.haml
+++ b/app/views/services/index.mobile.haml
@@ -7,14 +7,14 @@
 
 .settings_container.services_page.container-fluid
   .row
-    .col-lg-10.col-lg-offset-1
+    .col-md-12
       = render "shared/settings_nav"
 
   .row
-    .col-lg-8.col-lg-offset-2
+    .col-md-12
       = render "add_remove_services"
 
   .row
-    .col-lg-8.col-lg-offset-2
+    .col-md-12
       .services_explanation
         = t(".services_explanation")
diff --git a/app/views/users/_edit.haml b/app/views/users/_edit.haml
index e9d99e3ff..cde2620c5 100644
--- a/app/views/users/_edit.haml
+++ b/app/views/users/_edit.haml
@@ -6,11 +6,11 @@
   = t(".edit_account")
 
 .row
-  .col-lg-10.col-lg-offset-1
+  .col-md-12
     = render "shared/settings_nav"
 
 .row
-  .col-lg-8.col-lg-offset-2
+  .col-md-12
     .row
       .col-md-6
         %h3= t(".your_handle")
@@ -173,7 +173,7 @@
     %hr
 
     .row
-      .col-lg-7#account_data
+      .col-md-12#account_data
         .row
           .col-md-6
             %h3= t(".export_data")
@@ -208,7 +208,7 @@
                 = link_to t(".request_export_photos"), export_photos_user_path, method: :post,
                   class: "btn btn-default btn-block"
 
-      .col-lg-5
+      .col-md-12
         %h3
           = t(".close_account_text")
         .form-group
diff --git a/app/views/users/_privacy_settings.haml b/app/views/users/_privacy_settings.haml
index 60d8f704f..b80537224 100644
--- a/app/views/users/_privacy_settings.haml
+++ b/app/views/users/_privacy_settings.haml
@@ -1,9 +1,9 @@
 .row
-  .col-lg-10.col-lg-offset-1
+  .col-md-12
     = render "shared/settings_nav"
 
 .row
-  .col-lg-8.col-lg-offset-2
+  .col-md-12
     .row
       .col-md-12
         %h3