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

New inner-line diff algorithm. Added method 'unmarkup' to clear markup. Added option: vpcolor. Fixed autoresize and resize.

Browse Source
This commit is contained in:
Jamie Peabody
2013-05-12 19:52:47 +01:00
parent a3e50f8d8e
commit ea2263ff29
11 changed files with 283 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor.css
View File

@@ -6,10 +6,9 @@ body { margin: 0px; font-family: "trebuchet ms"; }
#info h3, #info p { display: none; }
#info button { visibility: hidden; font-size: 0.75em; }
#about, #editor, #settings { float: right !important; margin: 6px 5px 0 5px; }
#settings { }
#settings img { display: inline-block; height: 16px; vertical-align: middle; padding-bottom: 3px; }
.toolbar { display: none; margin: 0px; background: #e2e8ec url(../../images/toolbar_bg.png); border-bottom: 1px solid #A7BCC8; line-height: 14px; }
.toolbar { display: none; margin: 0px; background: #e2e8ec url(../../images/toolbar_bg.png); line-height: 15px; }
.title { display: none; font-weight: bold; }
.toolbar .ui-button { width: 1em; }
.toolbar input[type=text] { float: left; border: 1px solid #888; font-size: 12px; font-weight: bold; font-family: tahoma; letter-spacing: 1px; width: 150px; color: #444; margin-right: 2px; }
@@ -29,3 +28,4 @@ body { margin: 0px; font-family: "trebuchet ms"; }
#dialog-settings input[type=text] { width: 70px; border: 1px solid #444; float:right; }
#dialog-settings label.checkbox { width: auto; }
#dialog-settings fieldset { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; border: 1px solid #ccc; width: 222px; padding-right: 15px; }
#mergely-resizer { position: fixed; bottom: 0; top: 73px; width: 100%;}