loleaflet/css/toolbar.css | 6 ++++++
loleaflet/src/control/Control.Toolbar.js | 20 ++++++++++----------
2 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 6d3e88782e9bb0912ebed593802041d59538a0ee
Author: Pedro Pinto Silva <pedro.si...@collabora.com>
AuthorDate: Thu Feb 13 15:03:18 2020 +0100
Commit: Pedro Pinto da Silva <pedro.si...@collabora.com>
CommitDate: Thu Feb 13 15:08:06 2020 +0100
Fix Zoom controls:
- Percentage sometimes appears sometimes it doesn't. Removed percentage
from values and instead added as suffix (via css)
- Content width changes. Fixed by setting a default minimum width
Change-Id: I4c2017ceaa98c97f06c7bba4dfe0f3aded9d605c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88608
Tested-by: Pedro Pinto da Silva <pedro.si...@collabora.com>
Reviewed-by: Pedro Pinto da Silva <pedro.si...@collabora.com>
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 47ad32e4e..65921b617 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -33,6 +33,12 @@
#tb_actionbar_item_LanguageStatus .w2ui-tb-caption{
float: none;
}
+#tb_actionbar_item_zoom .w2ui-tb-caption{
+ min-width: 43px;
+}
+#tb_actionbar_item_zoom .w2ui-tb-caption::after {
+ content: '%';
+}
#document-signing-bar {
background-color: #ef324e;;
}
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 536c9c09c..c60962057 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1169,19 +1169,19 @@ function initNormalToolbar() {
{type: 'break', id: 'prevnextbreak'},
{type: 'button', id: 'zoomreset', img:
'zoomreset', hint: _('Reset zoom')},
{type: 'button', id: 'zoomout', img:
'zoomout', hint: _UNO('.uno:ZoomMinus')},
- {type: 'menu-radio', id: 'zoom', text: '100%',
+ {type: 'menu-radio', id: 'zoom', text: '100',
selected: 'zoom100',
mobile: false,
items: [
- { id: 'zoom50', text: '50%',
scale: 6},
- { id: 'zoom60', text: '60%',
scale: 7},
- { id: 'zoom70', text: '70%',
scale: 8},
- { id: 'zoom85', text: '85%',
scale: 9},
- { id: 'zoom100', text: '100%',
scale: 10},
- { id: 'zoom120', text: '120%',
scale: 11},
- { id: 'zoom150', text: '150%',
scale: 12},
- { id: 'zoom175', text: '175%',
scale: 13},
- { id: 'zoom200', text: '200%',
scale: 14}
+ { id: 'zoom50', text: '50',
scale: 6},
+ { id: 'zoom60', text: '60',
scale: 7},
+ { id: 'zoom70', text: '70',
scale: 8},
+ { id: 'zoom85', text: '85',
scale: 9},
+ { id: 'zoom100', text: '100',
scale: 10},
+ { id: 'zoom120', text: '120',
scale: 11},
+ { id: 'zoom150', text: '150',
scale: 12},
+ { id: 'zoom175', text: '175',
scale: 13},
+ { id: 'zoom200', text: '200',
scale: 14}
]
},
{type: 'button', id: 'zoomin', img: 'zoomin',
hint: _UNO('.uno:ZoomPlus')}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
