diff --git a/css/style.css b/css/style.css index 74667788..e97f5535 100755 --- a/css/style.css +++ b/css/style.css @@ -5,7 +5,7 @@ .documentslist { padding:5px; } -.documentslist .add-document { +.documentslist .add-document{ display: inline-block; height: 200px; width: 200px; @@ -16,10 +16,10 @@ display: inline-block; position: relative; height: 200px; - width: 98px; + width: 200px; background-repeat: no-repeat; background-size: 64px; - background-position: 18px; + background-position: 50% 68px; } .add-document .add { background-image: url('%webroot%/core/img/actions/add.svg'); @@ -66,16 +66,18 @@ text-align: center; } -#odf_close{ - float:left; +#odf-toolbar{ + position: absolute; + width: 100%; + z-index: 500; } -#odf_invite{ - float:right; +#odf-close{ + float:left; } -#editor-content #mainContainer{ - background-color: transparent; +#odf-invite{ + float:right; } #mainContainer #collaboration{ @@ -99,6 +101,7 @@ #mainContainer{ position:absolute; + z-index:500; } #documents-overlay, #documents-overlay-below{ @@ -107,20 +110,20 @@ left: 0; width: 100%; height: 100%; - filter:alpha(opacity=50); - opacity: 0.5; + filter:alpha(opacity=30); + opacity: 0.3; z-index: 1000; background: #000 url('%webroot%/core/img/loading-dark.gif') 50% 50% no-repeat; } #documents-overlay-below{ - left:85px; - top:48px; + left:0; + top:0; filter:alpha(opacity=100); opacity: 1; background:#f0f0f0; z-index: 999; } -#documents-content #editor, #documents-content #members{ +#members{ padding-top: 3em !important; } \ No newline at end of file diff --git a/js/documents.js b/js/documents.js index 8c02ab00..38e102d8 100644 --- a/js/documents.js +++ b/js/documents.js @@ -8,7 +8,6 @@ var documentsMain = { onStartup: function() { "use strict"; $('
').hide().appendTo(document.body); - $('#documents-overlay-below').css({left: $('#navigation').width()+4}); OC.addScript('documents', 'dojo-amalgamation', function() { OC.addScript('documents', 'webodf-debug').done(function() { // preload stuff in the background @@ -33,19 +32,19 @@ var documentsMain = { require({ }, ["webodf/editor/server/owncloud/ServerFactory", "webodf/editor/Editor"], function (ServerFactory, Editor) { // fade out file list and show WebODF canvas - $('.documentslist, #emptyfolder').fadeOut('slow').promise().done(function() { + $('#content').fadeOut('slow').promise().done(function() { // odf action toolbar var odfToolbarHtml = - '