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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/menubar.css                    |   42 +++++++++++++++++++++++++++
 loleaflet/src/control/Control.Notebookbar.js |    6 +++
 2 files changed, 48 insertions(+)

New commits:
commit c424141287c23eecf6fd0ead9c84269e108574a9
Author:     Pedro Pinto Silva <pedro.silva at collabora.com>
AuthorDate: Tue Jul 28 10:30:29 2020 +0200
Commit:     Pedro Silva <pedro.silva at collabora.com>
CommitDate: Tue Jul 28 14:58:38 2020 +0200

    Notebookbar: Add Menubar icon
    
    Change-Id: I49f3fda9d765f7934a80b8f71007adfc384fd3e2
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99574
    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/menubar.css b/loleaflet/css/menubar.css
index ea7a311c9..22a505fcd 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -172,6 +172,48 @@
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
+/* Hamburger icon: from shortcutsbar (notebookbar) */
+.notebookbar-shortcuts-bar #Menubar {padding-right: 7px;}
+
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.text-color-indicator #shortcuts-menubar-icon:after {
+	background: var(--blue1-txt-primary-color);
+}
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.presentation-color-indicator #shortcuts-menubar-icon:after {
+	background: var(--orange1-txt-primary-color);
+}
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon,
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:before,
+.hasnotebookbar.spreadsheet-color-indicator #shortcuts-menubar-icon:after {
+	background: var(--green0-txt-primary-color);
+}
+
+.hasnotebookbar #shortcuts-menubar-icon,
+.hasnotebookbar #shortcuts-menubar-icon:before,
+.hasnotebookbar #shortcuts-menubar-icon:after {
+	position: absolute;
+	top: 52%;
+	left: 0px;
+	height: 1px;
+	width: 13px;
+	-webkit-transition: all 0.25s;
+	transition: all 0.25s;
+}
+
+.hasnotebookbar #shortcuts-menubar-icon:before {
+	content: '';
+	top: -6px;
+	left: 0;
+}
+
+.notebookbar-shortcuts-bar #shortcuts-menubar-icon:after {
+	content: '';
+	top: 6px;
+	left: 0;
+}
 
 /* Hamburger icon */
 
diff --git a/loleaflet/src/control/Control.Notebookbar.js b/loleaflet/src/control/Control.Notebookbar.js
index 41c6f55d9..f9578c3af 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -118,6 +118,11 @@ L.Control.Notebookbar = L.Control.extend({
 				'id': 'shortcutstoolbox',
 				'type': 'toolbox',
 				'children': [
+					{
+						'type': 'toolitem',
+						'text': _('Menu'),
+						'command': '.uno:Menubar'
+					},
 					{
 						'type': 'toolitem',
 						'text': _('Save'),
@@ -143,6 +148,7 @@ L.Control.Notebookbar = L.Control.extend({
 		$('nav').prepend(shortcutsBar);
 		var builder = new L.control.notebookbarBuilder({mobileWizard: this, map: this.map, cssClass: 'notebookbar'});
 		builder.build(shortcutsBar, this.getShortcutsBarData());
+		$('#Menubar').html('<span id="shortcuts-menubar-icon"></span>');
 	},
 
 	setCurrentScrollPosition: function() {