kallithea Changeset - fd5d7b17fa72

Changeset - fd5d7b17fa72

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 12 years ago 2013-06-27 22:54:39
marcin@python-works.com

codecleaner

2 files changed with 11 insertions and 11 deletions:

rhodecode/public/css/mergerly.css

rhodecode/templates/files/diff_2way.html

0 comments (0 inline, 0 general)

rhodecode/public/css/mergerly.css

➞

Show inline comments

@@ @@ -27,15 +27,15 @@ @@
 .mergely.c.lhs,
 .mergely.c.rhs { background-color: #fafafa; }
 .mergely.c.lhs.start,
 .mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
 .mergely.c.lhs.end,
 .mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
 .mergely.ch.a.rhs { background-color: #ddffdd; }
 .mergely.ch.d.lhs { background-color: #ffdddd; }
 .mergely-margin #compare-lhs-margin,
 .mergely-margin #compare-rhs-margin{
+.mergely-margin #compare-rhs-margin {
     cursor: pointer
+}

rhodecode/templates/files/diff_2way.html

➞

Show inline comments

@@ @@ -50,31 +50,31 @@ ${self.repo_context_bar('changelog')} @@
                     </div>
                 </div>
             </div>
             <div id="compare"></div>
         </div>
     </div>
 <script>
 var orig1 = '${(c.orig1)|n}';
 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>
 </div>
 </%def>

0 comments (0 inline, 0 general)