Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] fix 'zoom' button icon

Browse source
This commit is contained in:
Maxim Kadushkin 2017-04-11 15:31:45 +03:00
parent f1280d2670
commit 2c37dd34b3
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/template/StatusBar.template
View file

@ -25,12 +25,12 @@
<div class="separator short el-edit el-review"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar"><span class="icon btn-ic-zoomtopage">&nbsp;</span></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar"><span class="icon btn-ic-zoomtowidth">&nbsp;</span></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><span class="icon btn-ic-zoomdown">&nbsp;</span></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><span class="icon btn-zoomdown">&nbsp;</span></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown">
<label id="label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><span class="icon btn-ic-zoomup">&nbsp;</span></button>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><span class="icon btn-zoomup">&nbsp;</span></button>
</div>
</div>

4
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1737,9 +1737,9 @@ define([
'data-stopPropagation="true"',
'<% } %>', '>',
'<label class="title">' + this.textZoom + '</label>',
'<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><span class="btn-icon btn-zoomin">&nbsp;</span></button>',
'<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomup">&nbsp;</i></button>',
'<label class="zoom"><%= options.value %>%</label>',
'<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><span class="btn-icon btn-zoomout">&nbsp;</span></button>',
'<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomdown">&nbsp;</i></button>',
'</div>'
].join('')),
stopPropagation: true,

2
apps/documenteditor/main/resources/less/statusbar.less
View file

@ -280,8 +280,6 @@
.button-normal-icon(btn-ic-zoomtowidth, 55, @toolbar-icon-size);
.button-normal-icon(btn-ic-zoomtopage, 56, @toolbar-icon-size);
.button-normal-icon(btn-ic-zoomup, 57, @toolbar-icon-size);
.button-normal-icon(btn-ic-zoomdown, 58, @toolbar-icon-size);
.button-normal-icon(btn-ic-review, 61, @toolbar-icon-size);
.button-normal-icon(btn-ic-doclang, 67, @toolbar-icon-size);
.button-normal-icon(btn-ic-docspell, 69, @toolbar-icon-size);

4
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -510,8 +510,8 @@
.button-normal-icon(btn-dropcap, 50, @toolbar-icon-size);
.button-normal-icon(btn-insertequation, 53, @toolbar-icon-size);
//.toolbar-btn-icon(btn-bold, 5, @toolbar-icon-size);
.button-normal-icon(btn-zoomin, 57, @toolbar-icon-size);
.button-normal-icon(btn-zoomout, 58, @toolbar-icon-size);
.button-normal-icon(btn-zoomup, 57, @toolbar-icon-size);
.button-normal-icon(btn-zoomdown, 58, @toolbar-icon-size);
.button-normal-icon(mmerge-next, 71, @toolbar-icon-size);
.button-normal-icon(mmerge-last, 72, @toolbar-icon-size);