loleaflet/dist/menubar.css | 2 ++
loleaflet/dist/toolbar.css | 7 ++++---
loleaflet/src/control/Control.Menubar.js | 12 ++++++++++++
3 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit a9c053fba46ce026d8c06bf23ff9a2abcb1222ee
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Apr 30 21:56:09 2018 +0530
loleaflet: move document-name-input in menubar
... so that it doesn't overlap with the menu items when the width of the
screen is reduced.
Change-Id: Ib1b2b18c631ed1c76b8807f6e3103e8eddd88efb
Reviewed-on: https://gerrit.libreoffice.org/53670
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index f192eacbf..cfdb8baf1 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -2,6 +2,8 @@
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 d56b809a2..0444312a2 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -79,13 +79,14 @@ w2ui-toolbar {
}
#document-name-input {
- position: fixed;
z-index: 1050;
- right: 35px;
top: 2px;
width: 200px;
- font-size: 16px;
+ font-size: 14px;
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 d6ec74ca8..86849ad11 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -503,6 +503,16 @@ 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()) {
@@ -519,6 +529,8 @@ 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
