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

styles: adjusted distance between buttons

Browse source
This commit is contained in:
Maxim Kadushkin 2017-07-04 17:24:15 +03:00
parent e97886cbdb
commit 1167d13814
6 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,6 +225,10 @@
width: 22px; width: 22px;
height: 22px; height: 22px;
} }
&.adding {
margin-right: 5px;
}
} }
} }

20
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -33,11 +33,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-copy"></span> <span class="btn-slot adding" id="slot-btn-copy"></span>
<span class="btn-slot" id="slot-btn-paste"></span> <span class="btn-slot" id="slot-btn-paste"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-undo"></span> <span class="btn-slot adding" id="slot-btn-undo"></span>
<span class="btn-slot" id="slot-btn-redo"></span> <span class="btn-slot" id="slot-btn-redo"></span>
</div> </div>
</div> </div>
@ -59,9 +59,9 @@
<span class="btn-slot" id="slot-btn-strikeout"></span> <span class="btn-slot" id="slot-btn-strikeout"></span>
<span class="btn-slot" id="slot-btn-superscript"></span> <span class="btn-slot" id="slot-btn-superscript"></span>
<span class="btn-slot" id="slot-btn-subscript"></span> <span class="btn-slot" id="slot-btn-subscript"></span>
<span class="btn-slot" id="slot-btn-highlight"></span> <span class="btn-slot split" id="slot-btn-highlight"></span>
<span class="btn-slot" id="slot-btn-fontcolor"></span> <span class="btn-slot split" id="slot-btn-fontcolor"></span>
<span class="btn-slot" id="slot-btn-paracolor"></span> <span class="btn-slot split" id="slot-btn-paracolor"></span>
</div> </div>
</div> </div>
<div class="separator long" style="margin-left: 5px;"></div> <div class="separator long" style="margin-left: 5px;"></div>
@ -84,18 +84,12 @@
</div> </div>
<div class="separator long" style="margin-left: 5px;"></div> <div class="separator long" style="margin-left: 5px;"></div>
<div class="group"> <div class="group">
<div class=elset">
<span class="btn-slot" id="slot-btn-clearstyle"></span>
</div>
<div class="elset"> <div class="elset">
<span class="btn-slot" id="slot-btn-copystyle"></span> <span class="btn-slot adding" id="slot-btn-clearstyle"></span>
</div>
</div>
<div class="group">
<div class="toolbar-elset">
<span class="btn-slot split" id="slot-btn-colorschemas"></span> <span class="btn-slot split" id="slot-btn-colorschemas"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-copystyle"></span>
<span class="btn-slot" id="slot-btn-mailrecepients"></span> <span class="btn-slot" id="slot-btn-mailrecepients"></span>
</div> </div>
</div> </div>

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

@ -20,8 +20,12 @@
} }
.font-attr { .font-attr {
> .btn-slot:not(:last-child) { > .btn-slot:not(:last-child):not(.split) {
margin-right: 8px; margin-right: 6px;
}
> .btn-slot:not(:last-child).split {
margin-right: 2px;
} }
} }
} }
@ -400,7 +404,7 @@
#slot-field-fontname { #slot-field-fontname {
float: left; float: left;
width: 165px; width: 166px;
} }
#slot-field-fontsize { #slot-field-fontsize {

14
apps/presentationeditor/main/app/template/Toolbar.template
View file

@ -32,11 +32,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-copy"></span> <span class="btn-slot adding" id="slot-btn-copy"></span>
<span class="btn-slot" id="slot-btn-paste"></span> <span class="btn-slot" id="slot-btn-paste"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-undo"></span> <span class="btn-slot adding" id="slot-btn-undo"></span>
<span class="btn-slot" id="slot-btn-redo"></span> <span class="btn-slot" id="slot-btn-redo"></span>
</div> </div>
</div> </div>
@ -103,17 +103,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot" id="slot-btn-clearstyle"></span> <span class="btn-slot adding" id="slot-btn-clearstyle"></span>
</div>
<div class="elset">
<span class="btn-slot" id="slot-btn-copystyle"></span>
</div>
</div>
<div class="group">
<div class="elset">
<span class="btn-slot split" id="slot-btn-colorschemas"></span> <span class="btn-slot split" id="slot-btn-colorschemas"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot adding" id="slot-btn-copystyle"></span>
<span class="btn-slot split" id="slot-btn-slidesize"></span> <span class="btn-slot split" id="slot-btn-slidesize"></span>
</div> </div>
</div> </div>

24
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -33,11 +33,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-copy"></span> <span class="btn-slot adding" id="slot-btn-copy"></span>
<span class="btn-slot" id="slot-btn-paste"></span> <span class="btn-slot" id="slot-btn-paste"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-undo"></span> <span class="btn-slot adding" id="slot-btn-undo"></span>
<span class="btn-slot" id="slot-btn-redo"></span> <span class="btn-slot" id="slot-btn-redo"></span>
</div> </div>
</div> </div>
@ -64,17 +64,17 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-top"></span> <span class="btn-slot adding" id="slot-btn-top"></span>
<span class="btn-slot split" id="slot-btn-middle"></span> <span class="btn-slot adding" id="slot-btn-middle"></span>
<span class="btn-slot split" id="slot-btn-bottom"></span> <span class="btn-slot adding" id="slot-btn-bottom"></span>
<span class="btn-slot split" id="slot-btn-wrap"></span> <span class="btn-slot adding" id="slot-btn-wrap"></span>
<span class="btn-slot split" id="slot-btn-text-orient"></span> <span class="btn-slot split" id="slot-btn-text-orient"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-align-left"></span> <span class="btn-slot adding" id="slot-btn-align-left"></span>
<span class="btn-slot split" id="slot-btn-align-center"></span> <span class="btn-slot adding" id="slot-btn-align-center"></span>
<span class="btn-slot split" id="slot-btn-align-right"></span> <span class="btn-slot adding" id="slot-btn-align-right"></span>
<span class="btn-slot split" id="slot-btn-align-just"></span> <span class="btn-slot adding" id="slot-btn-align-just"></span>
<span class="btn-slot split" id="slot-btn-merge"></span> <span class="btn-slot split" id="slot-btn-merge"></span>
</div> </div>
</div> </div>
@ -90,11 +90,11 @@
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-sortdesc"></span> <span class="btn-slot adding" id="slot-btn-sortdesc"></span>
<span class="btn-slot" id="slot-btn-sortasc"></span> <span class="btn-slot" id="slot-btn-sortasc"></span>
</div> </div>
<div class="elset"> <div class="elset">
<span class="btn-slot split" id="slot-btn-setfilter"></span> <span class="btn-slot adding" id="slot-btn-setfilter"></span>
<span class="btn-slot" id="slot-btn-clear-filter"></span> <span class="btn-slot" id="slot-btn-clear-filter"></span>
</div> </div>
</div> </div>

2
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -21,7 +21,7 @@
.font-attr { .font-attr {
> .btn-slot:not(:last-child):not(.split) { > .btn-slot:not(:last-child):not(.split) {
margin-right: 8px; margin-right: 6px;
} }
> .btn-slot.split:not(:last-child) { > .btn-slot.split:not(:last-child) {