loleaflet/dist/menubar.css | 2 -- loleaflet/dist/toolbar.css | 7 +++---- loleaflet/src/control/Control.Menubar.js | 12 ------------ 3 files changed, 3 insertions(+), 18 deletions(-)
New commits: commit 8f6df703334fe98daa2f8bcd4956690e85ccab02 Author: Pranav Kant <pran...@collabora.co.uk> Date: Wed May 2 23:05:54 2018 +0530 Revert "loleaflet: move document-name-input in menubar" The overflow: hidden is problematic here as popping out of menus from the menubar also stops working due to this. This reverts commit a9c053fba46ce026d8c06bf23ff9a2abcb1222ee. Change-Id: I5d86a38ff48c7ceced56592ab32a2e554f4b2e4f diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css index cfdb8baf1..f192eacbf 100644 --- a/loleaflet/dist/menubar.css +++ b/loleaflet/dist/menubar.css @@ -2,8 +2,6 @@ top: 39px; height: 25px; padding-left: 125px; - padding-right: 32px; /* for: the red close button on the right */ - overflow: hidden; z-index: 1000; outline: none; background-color: transparent; diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index 0444312a2..d56b809a2 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -79,14 +79,13 @@ w2ui-toolbar { } #document-name-input { + position: fixed; z-index: 1050; + right: 35px; top: 2px; width: 200px; - font-size: 14px; + font-size: 16px; padding-right: 20px; - padding-top: 6px; - padding-bottom: 5px; - padding-left: 5px; border: 1px solid transparent; background-color: transparent; } diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 86849ad11..d6ec74ca8 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -503,16 +503,6 @@ L.Control.Menubar = L.Control.extend({ } }, - _addAfterElements: function() { - var elemLi = L.DomUtil.create('li', '', this._menubarCont); - L.DomUtil.setStyle(elemLi, 'float', 'right'); - - // move document-name-input element to menubar - var elem = L.DomUtil.get('document-name-input'); - L.DomUtil.remove(elem); - elemLi.appendChild(elem); - }, - _onDocLayerInit: function() { // clear initial menu while (this._menubarCont.hasChildNodes()) { @@ -529,8 +519,6 @@ L.Control.Menubar = L.Control.extend({ this._initializeMenu(this.options.presentation); } - this._addAfterElements(); - // initialize menubar plugin $('#main-menu').smartmenus({ hideOnClick: true, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits