mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22414 from nextcloud/backport/22358/stable19

This commit is contained in:
John Molakvoæ 2020-08-25 18:04:14 +02:00 committed by GitHub
parent e57e66eedd 38e9e72351
commit ce8e020ea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/workflowengine/js/workflowengine.js
View File

File diff suppressed because one or more lines are too long

2
apps/workflowengine/js/workflowengine.js.map
View File

File diff suppressed because one or more lines are too long

10
apps/workflowengine/src/components/Event.vue
View File

@ -84,10 +84,7 @@ export default {
} }
.isComplex { .isComplex {
img { img {
vertical-align: top; vertical-align: text-top;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 4px;
} }
span { span {
padding-top: 2px; padding-top: 2px;
@ -131,6 +128,11 @@ export default {
font-weight: 900; font-weight: 900;
} }
.option__icon {
width: 16px;
height: 16px;
}
.eventlist img, .eventlist img,
.eventlist .text { .eventlist .text {
vertical-align: middle; vertical-align: middle;

7
apps/workflowengine/src/components/Rule.vue
View File

@ -232,21 +232,22 @@ export default {
.trigger p, .action p { .trigger p, .action p {
min-height: 34px; min-height: 34px;
display: flex; display: flex;
align-items: center;
& > span { & > span {
min-width: 50px; min-width: 50px;
text-align: right; text-align: right;
color: var(--color-text-maxcontrast); color: var(--color-text-maxcontrast);
padding-right: 10px; padding-right: 10px;
padding-top: 7px; padding-top: 6px;
margin-bottom: auto;
} }
.multiselect { .multiselect {
flex-grow: 1; flex-grow: 1;
max-width: 300px; max-width: 300px;
} }
} }
.trigger p:first-child span {
padding-top: 3px;
}
.check--add { .check--add {
background-position: 7px center; background-position: 7px center;