diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-06-28 13:15:35 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-06-29 14:12:06 +0200 |
| commit | d6947a56c0a3994e876f708a6f23dc32d10384af (patch) | |
| tree | 62e7447e171f1f8a89632a3fdd342e2980db53e4 /apps/workflowengine | |
| parent | 0ec483b668d14ec85ca23004cbc1ae1422909748 (diff) | |
| download | nextcloud-server-d6947a56c0a3994e876f708a6f23dc32d10384af.tar.gz nextcloud-server-d6947a56c0a3994e876f708a6f23dc32d10384af.zip | |
Adjust collaborative tags and automated tagging settings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/workflowengine')
| -rw-r--r-- | apps/workflowengine/css/admin.css | 19 | ||||
| -rw-r--r-- | apps/workflowengine/templates/admin.php | 16 |
2 files changed, 27 insertions, 8 deletions
diff --git a/apps/workflowengine/css/admin.css b/apps/workflowengine/css/admin.css index 5494b35ce69..0c34ffc8097 100644 --- a/apps/workflowengine/css/admin.css +++ b/apps/workflowengine/css/admin.css @@ -11,6 +11,10 @@ .workflowengine .operation button { margin-bottom: 0; } +.workflowengine .operation-name { + width: 100%; + max-width: 500px; +} .workflowengine .operation span.info { padding: 7px; color: #eee; @@ -34,10 +38,23 @@ background-color: #f8f8f8; } +.workflowengine .operation-header .operation-name { + align-self: flex-start; + padding: 10px; +} +.workflowengine .operation-header { + display: flex; +} +.workflowengine .operation-header .select2-container { + align-self: flex-end; +} +.workflowengine .operation-header .icon-delete { + margin-left: auto; +} .workflowengine .operation .button-delete, .workflowengine .operation .button-delete-check { opacity: 0.5; - padding: 7px; + padding: 11px; } .workflowengine .operation .button-delete:hover, .workflowengine .operation .button-delete:focus, diff --git a/apps/workflowengine/templates/admin.php b/apps/workflowengine/templates/admin.php index e9873f8f289..26d581aee03 100644 --- a/apps/workflowengine/templates/admin.php +++ b/apps/workflowengine/templates/admin.php @@ -46,12 +46,14 @@ <script type="text/template" id="operation-template"> <div class="operation{{#if hasChanged}} modified{{/if}}"> - <input type="text" class="operation-name" placeholder="<?php p($l->t('Short rule description')); ?>" value="{{operation.name}}"> - {{! delete only makes sense if the operation is already saved }} - {{#if operation.id}} - <span class="button-delete pull-right icon-delete"></span> - {{/if}} - <input type="text" class="pull-right operation-operation" value="{{operation.operation}}"> + <div class="operation-header"> + <input type="text" class="operation-name" placeholder="<?php p($l->t('Short rule description')); ?>" value="{{operation.name}}" /> + <input type="text" class="operation-operation" value="{{operation.operation}}" /> + {{! delete only makes sense if the operation is already saved }} + {{#if operation.id}} + <span class="button-delete icon-delete"></span> + {{/if}} + </div> <div class="checks"> {{#each operation.checks}} @@ -67,7 +69,7 @@ {{/each}} </select> <input type="text" class="check-value" value="{{value}}"> - <span class="button-delete-check pull-right icon-delete"></span> + <span class="button-delete-check icon-delete"></span> </div> {{/each}} </div> |