From f1c4721ea066ca786d9e5811945b46595394c94d Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 7 May 2014 03:02:58 +0300 Subject: [PATCH] Fix dropdown and rename --- css/style.css | 4 +++- js/documents.js | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/css/style.css b/css/style.css index 1b8cdfe7..8c032877 100755 --- a/css/style.css +++ b/css/style.css @@ -122,6 +122,7 @@ #odf-toolbar #dropdown{ right: auto; + top: 66px; } #body-user #document-title #header{ @@ -144,12 +145,13 @@ width: 80px; margin: 3px; background-size:80px 24px; + z-index: 110; } #document-title div{ position: relative; } -#document-title>input { +#document-title #header input { height:14px; margin: 0; padding:3px 6px; diff --git a/js/documents.js b/js/documents.js index a583c3b9..72b8038f 100644 --- a/js/documents.js +++ b/js/documents.js @@ -581,15 +581,15 @@ var documentsMain = { var extension = name.substr(lastPos + 1); name = name.substr(0, lastPos); var input = $('').val(name); - $('#document-title').append(input); - $('#document-title>div').hide(); + $('#header').append(input); + $('#document-title-container').hide(); input.on('blur', function(){ var newName = input.val(); if (!newName || newName === name) { input.tipsy('hide'); input.remove(); - $('#document-title>div').show(); + $('#document-title-container').show(); return; } else { @@ -600,7 +600,7 @@ var documentsMain = { if (Files.isFileNameValid(newName)) { input.tipsy('hide'); input.remove(); - $('#document-title>div').show(); + $('#document-title-container').show(); documentsMain.renameDocument(newName); } } @@ -797,7 +797,7 @@ $(document).ready(function() { } }); - $(document.body).on('click', '#document-title>div', documentsMain.onRenamePrompt); + $(document.body).on('click', '#document-title-container', documentsMain.onRenamePrompt); $(document.body).on('click', '#odf-close', documentsMain.onClose); $(document.body).on('click', '#odf-invite', documentsMain.onInvite);