kallithea Changeset - 59a38ec5ad8b

Changeset - 59a38ec5ad8b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-08-12 03:04:48
madski@unity3d.com

diff: tweak mergely side-by-side diff view

Expand diff pane to match view port and avoid extra scroll bars.

2 files changed with 17 insertions and 3 deletions:

kallithea/public/css/style.css

kallithea/templates/files/diff_2way.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -2953,6 +2953,17 @@ table.code-browser .browser-file { @@
     padding: 2px 0px 0px 2px;
     float: left;
+}
 .diffblock.twoway {
     overflow: visible;
+}
 .diffblock.twoway .diff-actions {
     padding-top: 0;
+}
 .diffblock.twoway .diff-actions label input {
     margin: -5px 5px 0 10px;
     position: relative;
     top: 3px;
+}
 .diffblock .diff-menu ul li {
     padding: 0px 0px 0px 0px !important;
+}

kallithea/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -31,8 +31,8 @@ ${self.repo_context_bar('changelog')} @@
         ${self.breadcrumbs()}
     </div>
     <div class="diff-container" style="overflow-x: hidden">
         <div class="diffblock comm" style="margin:3px; padding:1px">
     <div class="diff-container">
         <div class="diffblock comm twoway">
             <div class="code-header">
                 <div class="changeset_header">
                     <div class="changeset_file">
@@ @@ -68,7 +68,7 @@ var orig2_url = '${h.url('files_raw_home @@
 $(document).ready(function () {
     $('#compare').mergely({
         width: 'auto',
-        height: '600',
+        height: $(window).height() - $('#compare').offset().top - $('#footer').height() - 35,
         fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
         bgcolor: '#fff',
         viewport: true,
@@ @@ -91,6 +91,9 @@ $(document).ready(function () { @@
+            }
+        }
     });
     // recompute width - avoids overflow and horizontal scrollbar
     $('#compare').mergely('resize');
     $('#ignorews').change(function(e){
         var val = e.currentTarget.checked;
         $('#compare').mergely('options', {ignorews: val});

0 comments (0 inline, 0 general)