diff --git a/src/styles/hubl-framework/forms/buttons.scss b/src/styles/hubl-framework/forms/buttons.scss index 3db3e53..18d8192 100644 --- a/src/styles/hubl-framework/forms/buttons.scss +++ b/src/styles/hubl-framework/forms/buttons.scss @@ -1,4 +1,4 @@ -input[type='submit'] { +:not(.add-member) + input[type='submit'] { @extend .button, .text-xsmall, .text-bold, diff --git a/src/styles/hubl-framework/forms/inputs.scss b/src/styles/hubl-framework/forms/inputs.scss index 856c4e2..c618a3a 100644 --- a/src/styles/hubl-framework/forms/inputs.scss +++ b/src/styles/hubl-framework/forms/inputs.scss @@ -8,6 +8,7 @@ textarea { padding: 12px 14px; margin-top: 6px; line-height: 1; + height: 46px; width: 100%; box-sizing: border-box; -webkit-tap-highlight-color: var(--color-secondary); diff --git a/src/styles/hubl-framework/forms/widgets.scss b/src/styles/hubl-framework/forms/widgets.scss index 0ad0382..dce4cb1 100644 --- a/src/styles/hubl-framework/forms/widgets.scss +++ b/src/styles/hubl-framework/forms/widgets.scss @@ -44,6 +44,25 @@ hubl-status { } } +.add-member { + display: block; + width: 50%; + padding-right: 15px; + position: relative; + float: left; +} + +.add-member + input[type='submit'] { + @extend .button, + .text-xsmall, + .text-bold, + .text-uppercase, + .color-secondary, + .bordered; + margin-top: 14px; + white-space: normal; +} + solid-form-date { input[type="date"] { background-image: url("/images/calendar.svg"); diff --git a/src/views/circle/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug index cdfa01e..1fa48f7 100644 --- a/src/views/circle/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -26,17 +26,17 @@ div.segment.padding-large data-trans='data-label=circle.edit.buttonDelete' ) - solid-ac-checker.segment.clearfix(permission='acl:Write', bind-resources) + solid-ac-checker(permission='acl:Write', bind-resources) div#loader-circle-edit.loader.loader-top div div div div - solid-form.button-register( + solid-form.segment.clearfix.button-register( bind-resources - fields='status, name, owner, description' + fields='name, description, status, owner' required-status required-name required-owner @@ -46,14 +46,14 @@ div.segment.padding-large label-status='' widget-status='hubl-status' - label-name='Name' - label-owner='Owner' - label-description='Description' + label-name='' + label-owner='' + label-description='' - class-name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading float-left' - class-owner='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading float-left' + class-name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-medium lg-full text-small text-semibold text-uppercase text-color-heading' - class-status='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading icon icon-magnify' + class-status='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading icon icon-magnify float-left' + class-owner='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading float-left' widget-owner='solid-form-dropdown-autocompletion-label' widget-description='solid-form-textarea' @@ -63,19 +63,19 @@ div.segment.padding-large submit-button='Enregistrer' next='circle-information' - data-trans='label-name=circle.edit.labelStatus;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit' + data-trans='label-status=circle.edit.labelStatus;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit' ) - h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.edit.subTitle') + h3.segment.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.edit.subTitle') solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members') - solid-form.block.select-add( + solid-form.block.segment.margin-bottom-xlarge.clearfix.button-register( bind-resources nested-field='members' fields='user' range-user=`${endpoints.users || endpoints.get.users}` - class-user='team' + class-user='add-member' widget-user='solid-form-dropdown-autocompletion' submit-button=''