Mercurial > kallithea
changeset 7169:7d02958345ff
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.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 15 Feb 2018 00:23:52 +0100 |
| parents | 8f3469917832 |
| children | 28317fc212f4 |
| files | kallithea/public/less/style.less kallithea/templates/files/diff_2way.html |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/less/style.less Wed Feb 14 01:54:12 2018 +0100 +++ b/kallithea/public/less/style.less Thu Feb 15 00:23:52 2018 +0100 @@ -86,6 +86,11 @@ 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;
--- a/kallithea/templates/files/diff_2way.html Wed Feb 14 01:54:12 2018 +0100 +++ b/kallithea/templates/files/diff_2way.html Thu Feb 15 00:23:52 2018 +0100 @@ -30,7 +30,7 @@ ${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 @@ ${h.checkbox('edit_mode', label=_('Edit'))} </div> </div> - <div id="compare"></div> + <div id="compare" class="overflow-x-visible"></div> </div> </div>