diff options
| -rw-r--r-- | css/style.css | 11 | ||||
| -rw-r--r-- | js/editor.js | 24 |
2 files changed, 18 insertions, 17 deletions
diff --git a/css/style.css b/css/style.css index 7f6916f..1ac7b32 100644 --- a/css/style.css +++ b/css/style.css @@ -6,7 +6,6 @@ #editor_controls { background-color: white; height: 44px; - border-bottom: 2px solid #eee; position: absolute; top: 0; width: 100%; @@ -17,6 +16,11 @@ margin-top: 46px; } +.ace-clouds .ace_gutter { + background: #fff; + color: #aaa; +} + #editor { display: block; height: 100%; @@ -40,8 +44,7 @@ height: 88%; z-index:1002; overflow: hidden; - border: 2px solid #ccc; - background-color: white; + background-color: #fff; } @media(max-width: 768px) { @@ -146,4 +149,4 @@ div.editor_separator.save_separator { -moz-opacity: 0.7; opacity:.70; filter: alpha(opacity=70); -}
\ No newline at end of file +} diff --git a/js/editor.js b/js/editor.js index bf51dea..8607d21 100644 --- a/js/editor.js +++ b/js/editor.js @@ -4,7 +4,7 @@ */ var Files_Texteditor = { - + /** * Holds the editor container */ @@ -46,7 +46,7 @@ var Files_Texteditor = { * Save handler, triggered by the button, or keyboard */ _onSaveTrigger: function() { - // Don't save if not edited + // Don't save if not edited if(!OCA.Files_Texteditor.file.edited) { return; } // Don't try to save twice if(OCA.Files_Texteditor.saving) { return; } else { @@ -138,7 +138,7 @@ var Files_Texteditor = { history.pushState({file:filename, dir:context.dir}, 'Editor', '#editor'); }, - /** + /** * Handler for edits detected */ _onEdit: function () { @@ -190,10 +190,10 @@ var Files_Texteditor = { $('small.lastsaved').after(nextbtnhtml); OCA.Files_Texteditor.setFilenameMaxLength(); } - } + } }, - /** + /** * Setup on page load */ initialize: function(container) { @@ -204,7 +204,7 @@ var Files_Texteditor = { this.oldTitle = document.title; }, - /** + /** * Registers the file actions */ registerFileActions: function() { @@ -271,16 +271,14 @@ var Files_Texteditor = { * Load the editor control bar */ loadControlBar: function(file, context) { - var html = + var html = '<small class="filename">'+escapeHTML(file.name)+'</small>' - +'<div class="editor_separator save_separator"></div>' +'<button id="editor_save">' +t('files_texteditor', 'Save') - +'</button><div class="editor_separator lastsaved_separator"></div><small class="lastsaved">' + +'</button><small class="lastsaved">' +t('files_texteditor', 'Last saved: never') +'</small>' - +'<button id="editor_close" class="icon-close svg"></button>' - +'<div class="editor_separator close_separator">'; + +'<button id="editor_close" class="icon-close svg"></button>'; var controlBar = $('<div id="editor_controls"></div>').html(html); $('#editor_wrap').before(controlBar); this.setFilenameMaxLength(); @@ -488,7 +486,7 @@ var Files_Texteditor = { document.title = this.oldTitle; }, - /** + /** * Hide the editor (unsaved changes) */ hideEditor: function() { @@ -520,4 +518,4 @@ OCA.Files_Texteditor = Files_Texteditor; $(document).ready(function () { $('#editor').remove(); OCA.Files_Texteditor.initialize($('<div id="app-content-texteditor"></div>')); -});
\ No newline at end of file +}); |