Mercurial > kallithea

changeset 4050:fd5d7b17fa72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
codecleaner
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 27 Jun 2013 22:54:39 +0200
parents 3b5f32aeed36
children fd4ea41c2dc1
files rhodecode/public/css/mergerly.css rhodecode/templates/files/diff_2way.html
diffstat 2 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/mergerly.css	Wed Jun 12 02:13:05 2013 +0200
+++ b/rhodecode/public/css/mergerly.css	Thu Jun 27 22:54:39 2013 +0200
@@ -36,6 +36,6 @@
 
 
 .mergely-margin #compare-lhs-margin,
-.mergely-margin #compare-rhs-margin{
+.mergely-margin #compare-rhs-margin {
     cursor: pointer
 }
--- a/rhodecode/templates/files/diff_2way.html	Wed Jun 12 02:13:05 2013 +0200
+++ b/rhodecode/templates/files/diff_2way.html	Thu Jun 27 22:54:39 2013 +0200
@@ -59,20 +59,20 @@
 var orig2 = '${(c.orig2)|n}';
 
 $(document).ready(function () {
-	$('#compare').mergely({
+    $('#compare').mergely({
         width: 'auto',
-		height: '600',
+        height: '600',
         fgcolor: {a:'#ddffdd',c:'#cccccc',d:'#ffdddd'},
         bgcolor: '#fff',
         viewport: true,
-		cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
-		lhs: function(setValue) {
-			setValue(orig1);
-		},
-		rhs: function(setValue) {
-			setValue(orig2);
-		},
-	});
+        cmsettings: {mode: 'text/plain', readOnly: true, lineWrapping: false, lineNumbers: true},
+        lhs: function(setValue) {
+            setValue(orig1);
+        },
+        rhs: function(setValue) {
+            setValue(orig2);
+        },
+    });
 });
 </script>