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

changed button elements margins

Browse source
This commit is contained in:
Maxim Kadushkin 2017-07-03 18:27:50 +03:00
parent 917452f4de
commit e97886cbdb
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/common/main/resources/less/buttons.less
View file

@ -80,7 +80,7 @@
.caption { .caption {
line-height: 18px; line-height: 18px;
padding: 0 5px; padding: 0 4px;
} }
} }
} }
@ -111,6 +111,7 @@
.inner-box-caption { .inner-box-caption {
line-height: 18px; line-height: 18px;
padding: 0 4px;
} }
.icon { .icon {
@ -178,7 +179,7 @@
&:not(.icon-top) &:not(.icon-top)
.caption:not(:empty) { .caption:not(:empty) {
padding: 0 5px 0 2px; padding: 0 2px;
} }
.icon { .icon {
@ -186,17 +187,19 @@
margin: 0; margin: 0;
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
}
&:not(.x-huge) { &:not(.x-huge) {
.icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
}
&:not(svg):not(.x-huge){ &:not(svg) {
.background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px); .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 60px);
} }
} }
}
&.x-huge, .btn-group.x-huge > & { &.x-huge, .btn-group.x-huge > & {
:not(svg).icon { :not(svg).icon {
@ -278,10 +281,29 @@
.btn-group { .btn-group {
> .btn-toolbar { > .btn-toolbar {
float: none; float: none;
}
&.dropdown-toggle { > .btn {
padding-left: 1px; + .dropdown-toggle {
padding-right: 1px; padding: 0 2px;
}
}
> .dropdown-toggle:first-child {
padding: 0 2px 0 0;
.caption {
padding-right: 4px;
}
}
.caption {
&:empty {
display: none;
+ .caret {
margin-left: 2px;
}
} }
} }

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

@ -212,7 +212,7 @@
} }
&.split { &.split {
width: 29px; width: 31px;
} }
&.text { &.text {