lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-24 09:48:39 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kljh/Mergely

Browse Source 
Conflicts:
	lib/mergely.js
This commit is contained in:
Jamie Peabody
2014-08-17 15:35:16 +01:00
parent 456da5f2c8 3c4fe71683
commit e9e0a9d41b
9 changed files with 269 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor.css
View File

@@ -27,7 +27,9 @@ body { margin: 0; }
.icon-swap { background-image: url(images/swap.png); }
.icon-arrow-right { background-image: url(images/arrow-right.png); }
.icon-arrow-right-v { background-image: url(images/arrow-right-v.png); }
.icon-arrow-right-vv { background-image: url(images/arrow-right-vv.png); }
.icon-arrow-left-v { background-image: url(images/arrow-left-v.png); }
.icon-arrow-left-vv { background-image: url(images/arrow-left-vv.png); }
.icon-arrow-up { background-image: url(images/arrow-up-v.png); }
.icon-arrow-down { background-image: url(images/arrow-down-v.png); }
.icon-x-mark { background-image: url(images/x-mark.png); }