Skip to content

Commit 2d38c66

Browse files
committed
mergely
1 parent e442ae4 commit 2d38c66

File tree

11 files changed

+6268
-0
lines changed

11 files changed

+6268
-0
lines changed

mergely/Gruntfile.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module.exports = function(grunt) {
2+
var pkg = grunt.file.readJSON('package.json');
3+
4+
grunt.initConfig({
5+
pkg: pkg,
6+
7+
download: {
8+
options: {
9+
dest: 'src'
10+
},
11+
mergely: {
12+
options: {
13+
transform: function(code) {
14+
return [
15+
'define(function(require, exports, module) {',
16+
'var previousJQuery = this.jQuery;',
17+
'this.jQuery = require("$");',
18+
'var CodeMirror = require("codemirrorjs")',
19+
code,
20+
'module.exports = window.Mgly;',
21+
'this.jQuery = previousJQuery;',
22+
code,
23+
"});"
24+
].join('\n');
25+
}
26+
},
27+
url: 'https://raw.githubusercontent.com/wickedest/Mergely/master/lib/mergely.js',
28+
name: 'mergely.js'
29+
},
30+
css: {
31+
url: 'https://raw.githubusercontent.com/wickedest/Mergely/master/lib/mergely.css',
32+
name: 'mergely.css'
33+
}
34+
}
35+
});
36+
37+
grunt.loadGlobalTasks('spm-build');
38+
grunt.util._.merge(grunt.config.data, require('spm-build').config);
39+
40+
grunt.loadTasks('../_tasks/download/tasks');
41+
grunt.registerTask('build', ['download', 'spm-build']);
42+
};

mergely/dist/mergely-debug.css

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*! define gallery/mergely/2.5.0/mergely-debug.css */
2+
/* required */
3+
.mergely-column textarea { width: 80px; height: 200px; }
4+
.mergely-column { float: left; }
5+
.mergely-margin { float: left; }
6+
.mergely-canvas { float: left; width: 28px; }
7+
8+
/* resizeable */
9+
.mergely-resizer { width: 100%; height: 100%; }
10+
11+
/* style configuration */
12+
.mergely-column { border: 1px solid #ccc; }
13+
.mergely-active { border: 1px solid #a3d1ff; }
14+
15+
.mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
16+
.mergely.a.lhs.start.end,
17+
.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
18+
.mergely.a.rhs { background-color: #ddeeff; }
19+
.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }
20+
21+
.mergely.d.lhs { background-color: #edc0c0; }
22+
.mergely.d.lhs.end,
23+
.mergely.d.rhs.start.end { border-bottom: 1px solid #ff7f7f; }
24+
.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #ff7f7f; }
25+
.mergely.d.lhs.start { border-top: 1px solid #ff7f7f; }
26+
27+
.mergely.c.lhs,
28+
.mergely.c.rhs { background-color: #fafafa; }
29+
.mergely.c.lhs.start,
30+
.mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
31+
.mergely.c.lhs.end,
32+
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
33+
34+
.mergely.ch.a.rhs { background-color: #ddeeff; }
35+
.mergely.ch.d.lhs { background-color: #edc0c0; text-decoration: line-through; color: #888; }

0 commit comments

Comments
 (0)