iiiypuk/diff-online
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update mergely to 4.3.9

Browse Source
This commit is contained in:
Alexander Popov 2022-12-23 00:22:58 +03:00
parent cd2017c621
commit a954d49c5c
Signed by: iiiypuk
GPG Key ID: D8C9B59A9F04A70C
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.html
View File

@ -40,8 +40,9 @@
} }
$(document).ready(function () { $(document).ready(function () {
$('#compare').mergely({ $('#compare').mergely({
width: 'auto', editor_width: 'auto',
height: '400', editor_height: '400',
license: 'lgpl-separate-notice',
cmsettings: { cmsettings: {
readOnly: false, readOnly: false,
lineWrapping: true, lineWrapping: true,

35
lib/mergely.css
View File

@ -1,9 +1,3 @@
/**
* Copyright (c) 2014 by Jamie Peabody, http://www.mergely.com
* All rights reserved.
* Version: 3.3.7 2014-08-17
*/
/* required */ /* required */
.mergely-column textarea { width: 80px; height: 200px; } .mergely-column textarea { width: 80px; height: 200px; }
.mergely-column { float: left; } .mergely-column { float: left; }
@ -12,22 +6,26 @@
/* resizeable */ /* resizeable */
.mergely-resizer { width: 100%; height: 100%; } .mergely-resizer { width: 100%; height: 100%; }
.mergely-full-screen-0 { position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow: hidden; }
.mergely-full-screen-8 { position: absolute; top: 8px; bottom: 8px; left: 8px; right: 8px; overflow: hidden; }
/* style configuration */ /* style configuration */
.mergely-column { border: 1px solid #ccc; } .mergely-column { border: 1px solid #ccc; }
.mergely-active { border: 1px solid #a3d1ff; } .mergely-active { border: 1px solid #a3d1ff; }
.mergely.a,.mergely.d,.mergely.c { color: #000; }
.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; } .mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
.mergely.a.lhs.start.end, .mergely.a.lhs.start.end,
.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; } .mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
.mergely.a.rhs { background-color: #ddeeff; } .mergely.a.rhs { background-color: #ddeeff; }
.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; } .mergely.a.lhs.start.end.first { border-bottom-width: 0; border-top: 1px solid #a3d1ff; }
.mergely.d.lhs { background-color: #edc0c0; } .mergely.d.lhs { background-color: #ffe9e9; }
.mergely.d.lhs.end, .mergely.d.lhs.end,
.mergely.d.rhs.start.end { border-bottom: 1px solid #ff7f7f; } .mergely.d.rhs.start.end { border-bottom: 1px solid #f8e8e8; }
.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ff7f7f; } .mergely.d.rhs.start.end.first { border-bottom-width: 0; border-top: 1px solid #f8e8e8; }
.mergely.d.lhs.start { border-top: 1px solid #ff7f7f; } .mergely.d.lhs.start { border-top: 1px solid #f8e8e8; }
.mergely.c.lhs, .mergely.c.lhs,
.mergely.c.rhs { background-color: #fafafa; } .mergely.c.rhs { background-color: #fafafa; }
@ -37,4 +35,17 @@
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; } .mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
.mergely.ch.a.rhs { background-color: #ddeeff; } .mergely.ch.a.rhs { background-color: #ddeeff; }
.mergely.ch.d.lhs { background-color: #edc0c0; text-decoration: line-through; color: #888; } .mergely.ch.d.lhs { background-color: #ffe9e9; text-decoration: line-through; color: red !important; }
.mergely.current.start { border-top: 1px solid #000 !important; }
.mergely.current.end { border-bottom: 1px solid #000 !important; }
.mergely.current.lhs.a.start.end,
.mergely.current.rhs.d.start.end { border-top-width: 0 !important; }
.mergely.current.lhs.a.start.end.empty,
.mergely.current.rhs.d.start.end.empty { border-top-width: 1px !important; border-bottom-width: 0px !important; }
.mergely.current.CodeMirror-linenumber { color: #F9F9F9; font-weight: bold; background-color: #777; }
.CodeMirror-linenumber { cursor: pointer; }
.CodeMirror-code { color: #717171; }
span.CodeMirror-selectedtext { background: none !important; }

7
lib/mergely.min.js vendored
View File

File diff suppressed because one or more lines are too long