diff --git a/apps/systemtags/css/settings.css b/apps/systemtags/css/settings.css new file mode 100644 index 0000000000..5313247227 --- /dev/null +++ b/apps/systemtags/css/settings.css @@ -0,0 +1,17 @@ +.systemtag-input { + display: flex; + max-width: 500px; +} +#systemtags .select2-container { + width: 100%; + max-width: 500px; +} +#systemtag_name { + flex-grow: 1; +} + +#systemtag_delete, +#systemtag_reset, +#systemtag_submit { + padding: 8px; +} \ No newline at end of file diff --git a/apps/systemtags/js/admin.js b/apps/systemtags/js/admin.js index 1388d5b2d7..5e97cf8ad6 100644 --- a/apps/systemtags/js/admin.js +++ b/apps/systemtags/js/admin.js @@ -116,12 +116,14 @@ if (tagId > 0) { $('#systemtags').attr('data-systemtag-id', tagId); $('#systemtag_delete').removeClass('hidden'); - $('#systemtag_submit').val(t('systemtags_manager', 'Update')); + $('#systemtag_submit span').text(t('systemtags_manager', 'Update')); + $('#systemtag_create').addClass('hidden'); } else { $('#systemtag').select2('val', ''); $('#systemtags').attr('data-systemtag-id', ''); $('#systemtag_delete').addClass('hidden'); - $('#systemtag_submit').val(t('systemtags_manager', 'Create')); + $('#systemtag_submit span').text(t('systemtags_manager', 'Create')); + $('#systemtag_create').removeClass('hidden'); } }, diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php index e964f610ca..fa1b07cb18 100644 --- a/apps/systemtags/templates/admin.php +++ b/apps/systemtags/templates/admin.php @@ -27,32 +27,31 @@ script('core', [ ]); script('systemtags', 'admin'); +style('systemtags', 'settings'); /** @var \OCP\IL10N $l */ ?>
diff --git a/apps/workflowengine/css/admin.css b/apps/workflowengine/css/admin.css index 5494b35ce6..0c34ffc809 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 e9873f8f28..26d581aee0 100644 --- a/apps/workflowengine/templates/admin.php +++ b/apps/workflowengine/templates/admin.php @@ -46,12 +46,14 @@