Made use of CodeMirror viewport to greatly improve performance. Added settings to toggle paragraph LCD; line wrapping; white space; and side bars.

Released with CodeMirror 3.1.
This commit is contained in:
Jamie Peabody
2013-02-24 21:57:25 +00:00
parent 49f57eb72b
commit 274d85bf05
9 changed files with 1304 additions and 269 deletions

View File

@@ -5,9 +5,9 @@ body { margin: 0px; font-family: "trebuchet ms"; }
#logo { background: transparent url(/images/mergely_sm.png) no-repeat; width: 113px; height:30px; display: inline-block; top: 5px; left: 5px; position: relative; float: left; margin-right: 77px; }
#info h3, #info p { display: none; }
#info button { visibility: hidden; font-size: 0.75em; }
#about, .button-editor, #settings { float: right !important; margin: 6px 5px 0 0; }
#settings { display: inline-block; height: 16px; }
#settings img { display: inline-block; height: 16px; }
#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; }
.title { display: none; font-weight: bold; }
@@ -15,22 +15,17 @@ body { margin: 0px; font-family: "trebuchet ms"; }
.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; }
.toolbar .buttonset { display: inline-block; padding-top:5px; }
.toolbar .buttonset .ui-button { padding: 2px 14px 2px 7px; float: left; }
#share-menu { display: none; background-color:white;border: 3px solid #606060;left:340px;top:33px;position:absolute;width:280px;z-index:50; padding: 5px; height: 40px; }
#share-menu { display: none; background-color:white;border: 3px solid #606060;left:382px;top:34px;position:absolute;width:280px;z-index:50; padding: 5px; height: 40px; }
#share-menu label {font-weight: bold; font-size: .80em; color: #37AFFF; width: 80px; display: inline; padding-right: 5px; }
#share-menu input { width: 200px; border: 1px solid #606060;}
#dialog-confirm { display:none; }
.ui-dialog { font-size:0.75em; }
.toolbar .ui-button { margin-right: 1px; }
#download { font-size: 1.1em; }
.mbutton {
font: normal 0.8em Verdana,Arial,sans-serif; text-decoration: none;
background: url('mergely-theme/images/ui-bg_flat_100_808080_40x100.png') repeat-x scroll 50% 50% #808080;
border: 1px solid #575757; color: #fff; font-weight: normal; display: inline-block; margin-right: 0.1em; overflow: visible; padding: 5px 6px; position: relative;
text-align: center; cursor: pointer; border-radius: 3px;
}
.mbutton:hover { background: url('mergely-theme/images/ui-bg_highlight-soft_25_37afff_1x100.png') repeat-x scroll 50% 50% #808080; }
.mbutton { font-size: 12px; line-height: 24px; padding: 0 5px; border-width: 2px; border-radius: 4px; }
.mbutton:hover { text-decoration: underline; }
#dialog-settings { visibility: hidden; }
#dialog-settings label { width: 85px; display: inline-block; font-weight: bold; padding: 5px; }
#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: 175px; padding-right: 15px; }
#dialog-settings fieldset { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; border: 1px solid #ccc; width: 222px; padding-right: 15px; }