[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Szymon KÅ‚os (via logerrit)]

 loleaflet/css/notebookbar.css                       |   19 ++-----------------
 loleaflet/src/control/Control.NotebookbarCalc.js    |    4 ++--
 loleaflet/src/control/Control.NotebookbarImpress.js |    8 ++++----
 loleaflet/src/control/Control.NotebookbarWriter.js  |    8 ++++----
 4 files changed, 12 insertions(+), 27 deletions(-)

New commits:
commit 93f3c3ae6203fd82359692d10a3b27db0408177b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Aug 7 09:47:52 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Aug 7 10:21:03 2020 +0200

    notebookbar: don't change stacked items to inline
    
    Change-Id: I6dfb54c7bb313e4fdfca6105dfbb9e573e993693
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100285
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Pedro Silva <pedro.silva at collabora.com>

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index be9dc56ae..9d65c25b2 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -289,10 +289,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
 	text-align: center;
 }
 .unotoolbutton.notebookbar.has-label > *{ /*so they stay side by side*/
-	display: inline-block;
-}
-.spreadsheet-color-indicator.hasnotebookbar + #toolbar-wrapper #table-Insert .unotoolbutton.notebookbar.has-label > *{ /*except on calc insert, where we want double line*/
-	display: inline;
+	display: table-cell;
 }
 
 .unotoolbutton.notebookbar.has-label {
@@ -413,14 +410,6 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
 	margin-top: 15px;
 }
 
-#table-Insert #InsertTable.notebookbar {
-	width: 142px;
-}
-
-#table-Insert #BasicShapes.notebookbar{
-	width: 170px;
-}
-
 #table-Insert-Section-Pagebreak #InsertPagebreak.notebookbar img,
 #table-Insert-Section-Table #InsertTable.notebookbar img,
 #InsertObjectChart.notebookbar img,
@@ -678,12 +667,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, #SendToBack.notebookb
 
 /* Insert Tab */
 
-.presentation-color-indicator + #toolbar-wrapper #table-Insert #InsertTable.notebookbar {
-	width: 108px;
-}
-
 #table-Insert #HeaderAndFooter.notebookbar {
-	width: 160px;
+	min-width: 160px;
 }
 
 #table-Insert-Section-DrawText #Text.notebookbar img,
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js b/loleaflet/src/control/Control.NotebookbarCalc.js
index b05ea8650..de2a5f827 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -2208,14 +2208,14 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
 																					'enabled': 'true',
 																					'children': [
 																						{
-																							'type': 'bigtoolitem',
+																							'type': 'toolitem',
 																							'text': _UNO('.uno:BasicShapes'),
 																							'command': '.uno:BasicShapes'
 																						}
 																					]
 																				}
 																			],
-																			'vertical': 'false'
+																			'vertical': 'true'
 																		},
 																		{
 																			'id': 'Insert-Section-Symbol',
diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js b/loleaflet/src/control/Control.NotebookbarImpress.js
index 6c4eb3ea5..d1fff1c5a 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -2089,14 +2089,14 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 																					'enabled': 'true',
 																					'children': [
 																						{
-																							'type': 'bigtoolitem',
+																							'type': 'toolitem',
 																							'text': _UNO('.uno:InsertTable', 'presentation'),
 																							'command': '.uno:InsertTable'
 																						}
 																					]
 																				}
 																			],
-																			'vertical': 'false'
+																			'vertical': 'true'
 																		},
 																		{
 																			'id': 'Insert-Section-Image',
@@ -2221,14 +2221,14 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
 																					'enabled': 'true',
 																					'children': [
 																						{
-																							'type': 'bigtoolitem',
+																							'type': 'toolitem',
 																							'text': _UNO('.uno:BasicShapes'),
 																							'command': '.uno:BasicShapes'
 																						}
 																					]
 																				}
 																			],
-																			'vertical': 'false'
+																			'vertical': 'true'
 																		},
 																		{
 																			'id': 'Insert-Text',
diff --git a/loleaflet/src/control/Control.NotebookbarWriter.js b/loleaflet/src/control/Control.NotebookbarWriter.js
index b17e4be32..c7f1e4760 100644
--- a/loleaflet/src/control/Control.NotebookbarWriter.js
+++ b/loleaflet/src/control/Control.NotebookbarWriter.js
@@ -2289,14 +2289,14 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
 																					'enabled': 'true',
 																					'children': [
 																						{
-																							'type': 'bigtoolitem',
+																							'type': 'toolitem',
 																							'text': _UNO('.uno:InsertTable', 'text'),
 																							'command': '.uno:InsertTable'
 																						}
 																					]
 																				}
 																			],
-																			'vertical': 'false'
+																			'vertical': 'true'
 																		},
 																		{
 																			'id': 'Insert-Section-Image',
@@ -2478,14 +2478,14 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
 																					'enabled': 'true',
 																					'children': [
 																						{
-																							'type': 'bigtoolitem',
+																							'type': 'toolitem',
 																							'text': _UNO('.uno:BasicShapes'),
 																							'command': '.uno:BasicShapes'
 																						}
 																					]
 																				}
 																			],
-																			'vertical': 'false'
+																			'vertical': 'true'
 																		},
 																		{
 																			'id': 'Insert-Section-Symbol',