# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2018-02-15 00:23:52
# Node ID 7d02958345fff328bf56702f50c18302414a861f
# Parent  8f3469917832bcb8547ef9180fc29dc0bc00b612

diff: fix 2-way diff panes not being shown side by side

eee7674cef41 had the side effect of setting overflow styling on the DOM
elements used by mergely. That confused it's computation of sizes on some
browsers, scroll bars got added, and the panes were re-flowed to not be
side-by-side.

To fix that, add an exception that allow overflow-x to be set to visible.

diff --git a/kallithea/public/less/style.less b/kallithea/public/less/style.less
--- a/kallithea/public/less/style.less
+++ b/kallithea/public/less/style.less
@@ -86,6 +86,11 @@ nav.navbar.mainmenu .navbar-brand .brand
   min-height: 0.01%;
 }
 
+/* allow other exceptions to automatic overflow-x */
+.panel > .overflow-x-visible {
+  overflow-x: visible;
+}
+
 /* search highlighting */
 div.search-code-body pre .match {
   background-color: @highlight-color;
diff --git a/kallithea/templates/files/diff_2way.html b/kallithea/templates/files/diff_2way.html
--- a/kallithea/templates/files/diff_2way.html
+++ b/kallithea/templates/files/diff_2way.html
@@ -30,7 +30,7 @@ ${self.repo_context_bar('changelog')}
         ${self.breadcrumbs()}
     </div>
 
-    <div class="no-padding panel-body">
+    <div class="no-padding panel-body overflow-x-visible">
         <div class="panel panel-default">
             <div class="panel-heading clearfix">
                     <div class="pull-left">
@@ -56,7 +56,7 @@ ${self.repo_context_bar('changelog')}
                       ${h.checkbox('edit_mode', label=_('Edit'))}
                     </div>
             </div>
-            <div id="compare"></div>
+            <div id="compare" class="overflow-x-visible"></div>
         </div>
     </div>