loleaflet/css/notebookbar.css | 12 +++++++++++-
loleaflet/src/control/Control.JSDialogBuilder.js | 10 +++++++---
loleaflet/src/control/Control.NotebookbarBuilder.js | 1 -
3 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 53eaf895a7f78c46d39593193fbc05abba475166
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Apr 23 12:36:18 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri May 1 15:29:15 2020 +0200
notebookbar reset attributes control
Change-Id: I8e8551a5055f4dde776cbf88f6f7e3f1e6b62a7e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93266
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 59eaf7d7a..88bb958f7 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -55,9 +55,19 @@
box-shadow: 0 0 0px 4px #e6e6e640 !important;
}
-.ui-content.notebookbar .unobutton:hover {
+.ui-content.notebookbar .unobutton:hover, #clearFormatting.notebookbar div
img:hover {
box-shadow: 0 0 0px 4px #e6e6e6b0;
border-radius: 0.1px;
background-color: #e6e6e6b0;
cursor: pointer;
}
+
+/* Reset attributes control */
+#clearFormatting.notebookbar div img {
+ width: 24px !important;
+ height: 24px !important;
+}
+
+#clearFormatting.notebookbar {
+ height: 24px !important;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index de526eeeb..c6f138cd5 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1679,7 +1679,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
_clearFormattingControl: function(parentContainer, data, builder) {
var iconPath = builder._createIconPath(data.command);
- var sectionTitle = L.DomUtil.create('div', 'ui-header level-' +
builder._currentDepth + ' mobile-wizard-widebutton ui-widget', parentContainer);
+ var sectionTitle = L.DomUtil.create('div', 'ui-header ' +
builder.options.cssClass + ' level-' + builder._currentDepth + '
mobile-wizard-widebutton ui-widget', parentContainer);
+ sectionTitle.id = 'clearFormatting';
$(sectionTitle).css('justify-content', 'space-between');
if (data && data.id)
@@ -1693,8 +1694,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
icon.alt = '';
titleClass = 'menu-entry-with-icon';
}
- var titleSpan = L.DomUtil.create('span', titleClass, leftDiv);
- titleSpan.innerHTML = builder._cleanText(_UNO(data.command));
+
+ if (builder.options.noLabelsForUnoButtons !== true) {
+ var titleSpan = L.DomUtil.create('span', titleClass,
leftDiv);
+ titleSpan.innerHTML =
builder._cleanText(_UNO(data.command));
+ }
$(sectionTitle).click(function () {
builder.callback('toolbutton', 'click', sectionTitle,
data.command, builder);
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 4c200ec04..c2b0b97ff 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -24,7 +24,6 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:FrameLineColor'] = function() {};
this._toolitemHandlers['.uno:Color'] = function() {};
this._toolitemHandlers['.uno:FillColor'] = function() {};
- this._toolitemHandlers['.uno:ResetAttributes'] = function() {};
},
build: function(parent, data, hasVerticalParent, parentHasManyChildren)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
