loleaflet/css/toolbar.css | 5 +++--
loleaflet/html/loleaflet.html.m4 | 2 +-
loleaflet/src/control/Control.MobileWizard.js | 15 ++++++++++++++-
3 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 5036ddd66d3190d585e3dc29e0d21c6c37cec4f8
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Oct 9 14:05:29 2019 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Oct 9 14:06:20 2019 +0200
jsdialogs: move tabs into titlebar
Change-Id: I56ebec8c12164771c4da85954d43c600030e65dc
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 838c21c02..46a1a4994 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -975,13 +975,13 @@ tr.useritem > td > img {
#mobile-wizard-content {
overflow: scroll;
position: absolute;
- top: 48px;
+ top: 111px;
bottom: 0px;
width: 100%;
}
#mobile-wizard-tabs {
- height: 42px;
+ height: 63px;
}
#mobile-wizard-content *{
@@ -991,6 +991,7 @@ tr.useritem > td > img {
#mobile-wizard-titlebar {
background-color: white;
+ top: 63px;
height: 48px;
color: #636363;
border-bottom: 1px solid #dddddd !important;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index eafa2b306..7cab6343a 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -186,13 +186,13 @@ ifelse(MOBILEAPP,[true],
<div id="toolbar-down" style="display: none"></div>
<div id="mobile-wizard" style="display: none">
+ <div id="mobile-wizard-tabs"></div>
<table id="mobile-wizard-titlebar" width="100%">
<tr>
<td id="mobile-wizard-back"></td>
<td id="mobile-wizard-title" class="ui-widget"></td>
</tr>
</table>
- <div id="mobile-wizard-tabs"></div>
<div id="mobile-wizard-content"></div>
</div>
diff --git a/loleaflet/src/control/Control.MobileWizard.js
b/loleaflet/src/control/Control.MobileWizard.js
index 039568318..a87ad2176 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -26,6 +26,8 @@ L.Control.MobileWizard = L.Control.extend({
this.content.empty();
this.backButton.addClass('close-button');
$('#mobile-wizard-tabs').empty();
+ $('#mobile-wizard-tabs').hide();
+ $('#mobile-wizard-titlebar').css('top', '0px');
$('#mobile-wizard-content').css('top', '48px');
this._isTabMode = false;
},
@@ -57,9 +59,11 @@ L.Control.MobileWizard = L.Control.extend({
},
setTabs: function(tabs) {
+ $('#mobile-wizard-tabs').show();
$('#mobile-wizard-tabs').empty();
$('#mobile-wizard-tabs').append(tabs);
- $('#mobile-wizard-content').css('top', '110px');
+ $('#mobile-wizard-titlebar').hide();
+ $('#mobile-wizard-content').css('top', '63px');
this._isTabMode = true;
},
@@ -67,6 +71,11 @@ L.Control.MobileWizard = L.Control.extend({
if (!this._isTabMode || this._currentDepth > 0)
this.backButton.removeClass('close-button');
+ if (this._isTabMode && this._currentDepth > 0) {
+ $('#mobile-wizard-titlebar').show();
+ $('#mobile-wizard-tabs').hide();
+ }
+
var titles = '.ui-header.level-' + this.getCurrentLevel() +
'.mobile-wizard';
$(titles).hide('slide', { direction: 'left' }, 'fast');
$(contentToShow).siblings().hide();
@@ -102,6 +111,10 @@ L.Control.MobileWizard = L.Control.extend({
if (this._currentDepth == 0 || (this._isTabMode &&
this._currentDepth == 1)) {
this._inMainMenu = true;
this.backButton.addClass('close-button');
+ if (this._isTabMode) {
+ $('#mobile-wizard-titlebar').hide();
+ $('#mobile-wizard-tabs').show();
+ }
}
}
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
