Permalink
Browse files

2.4 changes

Added editor ability to download .diff files
Added color settings
  • Loading branch information...
wickedest committed Apr 9, 2012
1 parent b9b5508 commit ae02695b13819fd48d6d2e2e6c9091faf7e904b8
Showing with 1,167 additions and 1,203 deletions.
  1. +1 −1 LICENSE.html
  2. +1 −1 README.md
  3. +2 −43 doc/index.html
  4. +0 −5 lib/mergely.css
  5. +1,162 −1,147 lib/mergely.js
  6. +1 −6 lib/mergely.min.js
View
@@ -10,7 +10,7 @@
<body>
<h1>Software License Agreement</h1>
<p>
- <b>Mergely</b> - Copyright &copy; 2011, Jamie Peabody. All rights reserved.
+ <b>Mergely</b> - Copyright &copy; 2012, Jamie Peabody. All rights reserved.
</p>
<p>
Please see the <a href="http://www.mergely.com/license.php">Mergely license agreement</a>.
View
@@ -1,4 +1,4 @@
# Mergely
**An online diff/merge application**
-*Mergely is an online diff/merge editor and javascript library that highlights changes in similar texts. I can be used within your own web application to compare files, text, C, C++, Java, HTML, XML, CSS, and Javascript.
+Mergely is an online diff/merge editor and javascript library that highlights changes in similar texts. I can be used within your own web application to compare files, text, C, C++, Java, HTML, XML, CSS, and Javascript.
View
@@ -8,65 +8,24 @@
<meta name="author" content="Jamie Peabody" />
<link rel="shortcut icon" href="http://www.mergely.com/favicon.ico" />
<link rel="canonical" href="http://www.mergely.com" />
-
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
- <link type="text/css" rel="stylesheet" href="/style/mergely-theme/jquery-ui-1.8.16.custom.css" />
- <script src="/api/examples/jquery.corner.js" type="text/javascript"></script>
- <link type="text/css" rel="stylesheet" href="/api/lib/mergely.css" />
- <link type="text/css" rel="stylesheet" href="/style/editor.css" />
- <link type="text/css" rel="stylesheet" href="/style/screen.css" />
<style type="text/css">
body { font-family: Droid Sans, Arial, sans-serif; }
pre.code { border: 1px solid #37AFFF; background-color: #efefef; padding: 12px; }
dt { color: #3FA6EA; font-weight: bold; }
dd { margin-bottom: 1em; }
h1 { margin-top: 0px; }
+ .code { border-radius: 8px; }
</style>
- <script type="text/javascript">
- $(document).ready(function(){
- $('.code').corner('8px');
- $('#editor,#download').css({'visibility':'visible'}).button().click(function(){
- window.location.href = $(this).attr('formaction');
- });
- $('#editor').css({'float':'right'});
- });
- </script>
-
- <script src="http://www.mergely.com/js/gatag.js" type="text/javascript"></script>
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-85576-5']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
- <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
</head>
<body>
<div class="main">
- <div id="header">
- <div id="info">
- <h3>Mergely - Diff online!</h3>
- <div id="logo"></div>
- <button id="editor" class="button-editor" title="Switch to Mergely Editor" type="submit" formaction="/index.php" formmethod="get">Editor</button>
- <div style="float:right;width:80px;padding-top:6px;height:30px;display:inline-block;">
- <g:plusone></g:plusone>
- </div>
- </div>
- </div>
-
<div id="body">
<div id="bodycontent" style="margin-right:0px;">
- <h1>Mergely Manual</h1>
+ <h1>Mergely Reference Manual</h1>
<h2>Overview</h2>
<p>
View
@@ -1,8 +1,3 @@
-/**
- * Copyright (c) 2012 by Jamie Peabody, http://www.mergely.com/
- * All rights reserved.
- * Version: 2.3 2012-02-07
- */
/* required */
.mergely-column textarea { width: 80px; height: 200px; }
.mergely-column { float: left; }
Oops, something went wrong.

0 comments on commit ae02695

Please sign in to comment.