[Libreoffice-commits] online.git: loleaflet/dist

[Henry Castro]

 loleaflet/dist/loleaflet.css      |   18 +++++++++++++++---
 loleaflet/dist/loleaflet.html.m4  |    1 +
 loleaflet/dist/menubar.css        |    4 ----
 loleaflet/dist/toolbar.css        |    9 ---------
 loleaflet/dist/toolbar/toolbar.js |    8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 21649f4d642ea1b87d8f76946640d15777017ea3
Author: Henry Castro <hcastro at collabora.com>
Date:   Sat Apr 14 11:14:53 2018 -0400

    loleaflet: fix resize toolbar
    
    Change-Id: I0fa9420eb4421a9244655b4503045bac39a271e4

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 30db2df72..469106e26 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -66,6 +66,19 @@ body {
     top: 30px;
 }
 
+#toolbar-wrapper {
+    position: relative;
+    display: table;
+    table-layout: fixed;
+    border-collapse: collapse;
+    width: 100%;
+}
+
+#toolbar-logo {
+    display: table-cell;
+    width: 125px;
+}
+
 @media (max-width: 767px) {
     /* Show slidesorter beyond 768px only */
     #presentation-controls-wrapper {
@@ -90,9 +103,8 @@ body {
     #spreadsheet-row-column-frame.readonly {
 	top: 30px !important;
     }
-    /* We need to give space for options menu */
-    #tb_toolbar-up_item_rightmenupadding {
-	padding-right: 40px;
+    #toolbar-logo {
+	width: 32px;
     }
     #closebutton {
 	display: none;
diff --git a/loleaflet/dist/loleaflet.html.m4 b/loleaflet/dist/loleaflet.html.m4
index 0fd1caf07..0ffd4b5cb 100644
--- a/loleaflet/dist/loleaflet.html.m4
+++ b/loleaflet/dist/loleaflet.html.m4
@@ -50,6 +50,7 @@ ifelse(debug,[true],[<link rel="stylesheet" href="/loleaflet/%VERSION%/w2ui-1.5.
 	<ul id="main-menu" class="sm sm-simple lo-menu"></ul>
       </nav>
       <div id="toolbar-wrapper">
+	<div id="toolbar-logo"></div>
 	<div id="toolbar-up"></div>
 	<div id="formulabar"></div>
       </div>
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 1d8e5eecb..f192eacbf 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -190,10 +190,6 @@
     display: block;
 }
 
-#toolbar-wrapper {
-    position: relative;
-}
-
 /* desktop mode */
 @media (min-width: 768px) {
     /* hide the button in desktop view */
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 4889eb456..300126780 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -56,11 +56,6 @@ w2ui-toolbar {
 #tb_presentation-toolbar_item_left {
     width: 50%;
 }
-/* leave space for branding logo */
-#tb_toolbar-up_item_left {
-    width: 0;
-    padding-left: 125px;
-}
 
 #addressInput {
     height: 29px;
@@ -119,10 +114,6 @@ w2ui-toolbar {
 }
 .closebuttonimage{ background: url('../images/lc_closedoc.svg') no-repeat center !important; }
 
-#tb_toolbar-up_item_right {
-    width: 100%;
-}
-
 #tb_toolbar-down_item_left {
     width: 45%;
 }
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index df13c7a5d..91cae22e1 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -99,6 +99,7 @@ function _unmobilify() {
 
 function resizeToolbar() {
 	var toolbarUp = w2ui['toolbar-up'];
+	var statusbar = w2ui['toolbar-down'];
 
 	if ($(window).width() < mobileWidth) {
 		_mobilify();
@@ -107,6 +108,8 @@ function resizeToolbar() {
 	}
 
 	toolbarUp.refresh();
+	toolbarUp.resize();
+	statusbar.resize();
 }
 
 function _cancelSearch() {
@@ -386,7 +389,6 @@ $(function () {
 	$('#toolbar-up').w2toolbar({
 		name: 'toolbar-up',
 		items: [
-			{type: 'html', id: 'left'},
 			{type: 'menu', id: 'writer:menu:wrap', caption: _('Textwrap'), items: [
 				{ text: _('No wrap'), id: 'wrap-WrapOff' },
 				{ text: _('Page wrap'), id: 'wrap-WrapOn' },
@@ -447,9 +449,7 @@ $(function () {
 			{type: 'button',  id: 'insertobjectchart',  img: 'insertobjectchart', hint: _UNO('.uno:InsertObjectChart', '', true), uno: 'InsertObjectChart'},
 			{type: 'button',  id: 'insertannotation', img: 'annotation', hint: _UNO('.uno:InsertAnnotation', '', true)},
 			{type: 'button',  id: 'insertgraphic',  img: 'insertgraphic', hint: _UNO('.uno:InsertGraphic', '', true)},
-			{type: 'button',  id: 'specialcharacter', img: 'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: '.uno:InsertSymbol'},
-			{type: 'html', id: 'right'},
-			{type: 'html', id: 'rightmenupadding'}
+			{type: 'button',  id: 'specialcharacter', img: 'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: '.uno:InsertSymbol'}
 		],
 		onClick: function (e) {
 			onClick(e.target);