From 90c808871198a87585cf74d51bda684815cb634e Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:44:34 +0100 Subject: [PATCH 1/9] IBX-7198: Updated label,form styling in edit and create --- .../Resources/public/img/qualifio-promote.svg | 1 + .../public/scss/_anchor-navigation.scss | 54 ++++++++----------- src/bundle/Resources/public/scss/_card.scss | 4 ++ .../Resources/public/scss/_content-edit.scss | 2 +- .../public/scss/_content-type-edit.scss | 21 +++----- .../Resources/public/scss/_details.scss | 1 - .../Resources/public/scss/_edit-header.scss | 25 +++------ .../Resources/public/scss/_extra-actions.scss | 6 +-- .../Resources/public/scss/_field-group.scss | 4 -- .../Resources/public/scss/_general.scss | 4 -- src/bundle/Resources/public/scss/_labels.scss | 1 - .../Resources/public/scss/_search-form.scss | 1 - src/bundle/Resources/public/scss/_tables.scss | 3 +- src/bundle/Resources/public/scss/_tabs.scss | 2 +- .../scss/fieldType/edit/_base-field.scss | 22 ++++++-- .../fieldType/edit/_ezobjectrelationlist.scss | 4 -- .../public/scss/fieldType/edit/_ezuser.scss | 1 - .../public/scss/mixins/_containers.scss | 2 +- .../scss/ui/modules/sub-items-list/_main.scss | 1 - .../change_password/form_fields.html.twig | 2 +- .../account/change_password/index.html.twig | 2 +- .../admin/account/settings/update.html.twig | 7 +-- .../admin/content/create/create.html.twig | 2 +- .../themes/admin/content/edit/edit.html.twig | 2 +- .../admin/content/edit_macros.html.twig | 4 +- .../admin/content/form_fields.html.twig | 30 +++++------ .../content_type_group/create.html.twig | 2 +- .../content_type_group/edit.html.twig | 2 +- .../admin/content_type/create.html.twig | 18 +++---- .../themes/admin/content_type/edit.html.twig | 18 +++---- .../themes/admin/language/create.html.twig | 6 +-- .../themes/admin/language/edit.html.twig | 4 +- .../themes/admin/object_state/add.html.twig | 4 +- .../themes/admin/object_state/edit.html.twig | 4 +- .../object_state_group/add.html.twig | 4 +- .../object_state_group/edit.html.twig | 4 +- .../themes/admin/section/create.html.twig | 4 +- .../themes/admin/section/update.html.twig | 4 +- .../themes/admin/ui/edit_header.html.twig | 5 -- .../themes/admin/ui/form_fields.html.twig | 13 +++-- .../views/themes/admin/user/create.html.twig | 2 +- .../views/themes/admin/user/edit.html.twig | 2 +- .../themes/admin/user/role/add.html.twig | 2 +- .../themes/admin/user/role/copy.html.twig | 2 +- .../themes/admin/user/role/edit.html.twig | 2 +- 45 files changed, 136 insertions(+), 174 deletions(-) create mode 100644 src/bundle/Resources/public/img/qualifio-promote.svg diff --git a/src/bundle/Resources/public/img/qualifio-promote.svg b/src/bundle/Resources/public/img/qualifio-promote.svg new file mode 100644 index 0000000000..92a4ce7750 --- /dev/null +++ b/src/bundle/Resources/public/img/qualifio-promote.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/bundle/Resources/public/scss/_anchor-navigation.scss b/src/bundle/Resources/public/scss/_anchor-navigation.scss index 3746efccca..2d06541482 100644 --- a/src/bundle/Resources/public/scss/_anchor-navigation.scss +++ b/src/bundle/Resources/public/scss/_anchor-navigation.scss @@ -1,52 +1,40 @@ .ibexa-anchor-navigation { $self: &; - &__section-group { - display: none; + &__sections { + .card { + position: unset; + } + } - &--active { - display: block; + &__section { + border-bottom: calculateRem(1px) solid $ibexa-color-light; + margin-bottom: calculateRem(36px); + + .ibexa-form-field:last-child { + margin-bottom: calculateRem(24px); } - .ibexa-edit-content__container:first-of-type { - .ibexa-content-type-edit__section-column-header { - margin-top: 0; - } + &:last-child { + border-bottom: none; } } - &__section-group-header { - padding: calculateRem(16px) 0; + &__section-group { + display: none; + + &--active { + display: block; + } } &__section-header { - padding-top: calculateRem(64px); - margin-top: calculateRem(64px); - border-top: calculateRem(1px) solid $ibexa-color-light; + margin-bottom: calculateRem(24px); } &__section-help { color: $ibexa-color-dark-400; - } - - &__sections { - .card { - position: unset; - } - } - - &__section:first-of-type { - .ibexa-field-edit:first-of-type { - .ibexa-label { - margin-top: 0; - } - } - - #{$self}__section-header { - padding-top: calculateRem(16px); - margin-top: 0; - border-top: 0; - } + padding-bottom: calculateRem(24px); } } diff --git a/src/bundle/Resources/public/scss/_card.scss b/src/bundle/Resources/public/scss/_card.scss index 0b76fd7d07..ebb6cfc4ff 100644 --- a/src/bundle/Resources/public/scss/_card.scss +++ b/src/bundle/Resources/public/scss/_card.scss @@ -201,3 +201,7 @@ } } } + +.ibexa-card-body { + padding: 0; +} diff --git a/src/bundle/Resources/public/scss/_content-edit.scss b/src/bundle/Resources/public/scss/_content-edit.scss index 798e5e7056..1f73019eba 100644 --- a/src/bundle/Resources/public/scss/_content-edit.scss +++ b/src/bundle/Resources/public/scss/_content-edit.scss @@ -10,6 +10,6 @@ } &__section-header { - padding-top: calculateRem(16px); + margin-bottom: calculateRem(24px); } } diff --git a/src/bundle/Resources/public/scss/_content-type-edit.scss b/src/bundle/Resources/public/scss/_content-type-edit.scss index e702bc826e..30751ace84 100644 --- a/src/bundle/Resources/public/scss/_content-type-edit.scss +++ b/src/bundle/Resources/public/scss/_content-type-edit.scss @@ -15,20 +15,10 @@ padding: 0; } - .ibexa-edit-content__container--meta { - .ibexa-content-type-edit { - &__section-column-header { - border-top: calculateRem(1px) solid $ibexa-color-light; - padding-top: calculateRem(16px); - margin-top: calculateRem(40px); - } - } - } - &__section { display: flex; flex-wrap: wrap; - margin: 0 0 calculateRem(32px) 0; + margin: 0 0 calculateRem(36px) 0; &--one-column-layout { .ibexa-content-type-edit__section-column { @@ -40,8 +30,6 @@ } &__section-column { - margin: 0 0 calculateRem(50px) 0; - &--left-col { width: 60%; } @@ -52,8 +40,11 @@ } &__section-column-header { - margin-top: calculateRem(32px); - margin-bottom: 0; + margin-bottom: calculateRem(24px); + + &--seo { + margin-top: calculateRem(36px); + } } &__section-column-body { diff --git a/src/bundle/Resources/public/scss/_details.scss b/src/bundle/Resources/public/scss/_details.scss index a197dfa144..5db2facb52 100644 --- a/src/bundle/Resources/public/scss/_details.scss +++ b/src/bundle/Resources/public/scss/_details.scss @@ -57,7 +57,6 @@ &--small { .ibexa-table-header { - margin-top: 0; padding-bottom: 0; } } diff --git a/src/bundle/Resources/public/scss/_edit-header.scss b/src/bundle/Resources/public/scss/_edit-header.scss index 9a307bb206..205f041ee7 100644 --- a/src/bundle/Resources/public/scss/_edit-header.scss +++ b/src/bundle/Resources/public/scss/_edit-header.scss @@ -15,11 +15,13 @@ &__container { display: flex; flex-direction: column; - padding: 0 calculateRem(36px); + padding: calculateRem(24px) calculateRem(32px); + border-bottom: calculateRem(1px) solid $ibexa-color-light; } &__title { display: flex; + margin: 0; } &__name { @@ -41,7 +43,7 @@ transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; &--top { - height: calculateRem(85px); + height: calculateRem(48px); .ibexa-edit-header__title { height: 0; @@ -52,7 +54,6 @@ &--bottom { flex-direction: column; min-width: 60%; - min-height: calculateRem(60px); } } @@ -65,8 +66,7 @@ justify-content: center; white-space: nowrap; padding-left: 0; - margin-top: calculateRem(20px); - height: calculateRem(48px); + align-self: flex-start; .ibexa-icon { margin-right: calculateRem(8px); @@ -86,7 +86,6 @@ &__context-actions { display: flex; - margin-top: calculateRem(20px); width: 100%; } @@ -127,11 +126,6 @@ margin-top: calculateRem(10px); } - &__bottom-row-line { - margin-top: auto; - border-bottom: calculateRem(1px) solid $ibexa-color-light; - } - .ibexa-autosave { display: inline-block; border-left: calculateRem(1px) solid $ibexa-color-light; @@ -149,12 +143,7 @@ &--bottom { z-index: 1; min-width: initial; - margin-top: calculateRem(-40px); - } - } - - &__row { - &--bottom { + margin-top: calculateRem(-34px); min-height: initial; } } @@ -164,7 +153,7 @@ } &__action-name-container { - margin-top: calculateRem(-30px); + margin-top: calculateRem(-8px); } &__separate-div { diff --git a/src/bundle/Resources/public/scss/_extra-actions.scss b/src/bundle/Resources/public/scss/_extra-actions.scss index 38d33d45a7..afcc130373 100644 --- a/src/bundle/Resources/public/scss/_extra-actions.scss +++ b/src/bundle/Resources/public/scss/_extra-actions.scss @@ -63,12 +63,8 @@ max-height: calc(100% - #{calculateRem(90px)}); overflow: auto; - .form-group { - margin-bottom: 0; - } - &--create { - padding-top: 0; + padding-top: calculateRem(24px); padding-bottom: 0; } } diff --git a/src/bundle/Resources/public/scss/_field-group.scss b/src/bundle/Resources/public/scss/_field-group.scss index bc71e0a464..fa1278034c 100644 --- a/src/bundle/Resources/public/scss/_field-group.scss +++ b/src/bundle/Resources/public/scss/_field-group.scss @@ -140,10 +140,6 @@ .ezcountry-field { margin-bottom: 0; } - - .ibexa-table-header { - margin-top: 0; - } } } diff --git a/src/bundle/Resources/public/scss/_general.scss b/src/bundle/Resources/public/scss/_general.scss index 09017367fb..0ba418ee88 100644 --- a/src/bundle/Resources/public/scss/_general.scss +++ b/src/bundle/Resources/public/scss/_general.scss @@ -197,10 +197,6 @@ select { border-radius: $ibexa-border-radius; box-shadow: $ibexa-edit-header-box-shadow; margin-bottom: calculateRem(32px); - - .ibexa-table-header { - margin-top: 0; - } } .ibexa-error-site { diff --git a/src/bundle/Resources/public/scss/_labels.scss b/src/bundle/Resources/public/scss/_labels.scss index f363c547f4..90e633cf03 100644 --- a/src/bundle/Resources/public/scss/_labels.scss +++ b/src/bundle/Resources/public/scss/_labels.scss @@ -4,7 +4,6 @@ font-size: $ibexa-text-font-size-small; color: $ibexa-color-dark-400; line-height: calculateRem(18px); - margin-top: calculateRem(32px); margin-bottom: calculateRem(8px); padding-top: 0; padding-bottom: 0; diff --git a/src/bundle/Resources/public/scss/_search-form.scss b/src/bundle/Resources/public/scss/_search-form.scss index 2d554adf08..a4beb34296 100644 --- a/src/bundle/Resources/public/scss/_search-form.scss +++ b/src/bundle/Resources/public/scss/_search-form.scss @@ -33,7 +33,6 @@ .ibexa-table-header { border-bottom: none; padding-bottom: calculateRem(4px); - margin-top: 0; font-size: $ibexa-text-font-size-extra-large; } diff --git a/src/bundle/Resources/public/scss/_tables.scss b/src/bundle/Resources/public/scss/_tables.scss index c3338da243..dd7e258699 100644 --- a/src/bundle/Resources/public/scss/_tables.scss +++ b/src/bundle/Resources/public/scss/_tables.scss @@ -272,8 +272,7 @@ display: flex; justify-content: space-between; align-items: center; - margin-top: calculateRem(30px); - padding-bottom: calculateRem(15px); + padding-bottom: calculateRem(8px); border-bottom: calculateRem(1px) solid $ibexa-color-dark-200; &__headline { diff --git a/src/bundle/Resources/public/scss/_tabs.scss b/src/bundle/Resources/public/scss/_tabs.scss index cab3a753b4..b4cae5171e 100644 --- a/src/bundle/Resources/public/scss/_tabs.scss +++ b/src/bundle/Resources/public/scss/_tabs.scss @@ -395,7 +395,7 @@ } &__pane { - padding: calculateRem(10px) calculateRem(24px) calculateRem(24px); + padding: calculateRem(24px); &--no-padding { padding: 0; diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss index 8780ea6840..1451ff140e 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss @@ -1,6 +1,4 @@ .ibexa-field-edit { - margin-top: calculateRem(8px); - &__label { @include label-required(); } @@ -9,7 +7,7 @@ &--compound { border: calculateRem(1px) solid $ibexa-color-dark-200; border-radius: $ibexa-border-radius; - padding: 0 calculateRem(23px) calculateRem(26px); + padding: calculateRem(24px) calculateRem(23px) calculateRem(26px); } } @@ -236,3 +234,21 @@ } } } + +.ibexa-form-field { + margin-bottom: calculateRem(24px); + + &:last-child, + &--last { + margin-bottom: 0; + } +} + +.ibexa-data-form-field { + margin-bottom: calculateRem(24px); + + &:last-child, + &--last { + margin-bottom: 0; + } +} diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ezobjectrelationlist.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ezobjectrelationlist.scss index 0bdedcd89d..cde07fa502 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ezobjectrelationlist.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ezobjectrelationlist.scss @@ -16,10 +16,6 @@ padding: calculateRem(24px); } - .ibexa-table-header { - margin-top: 0; - } - .ibexa-relations { &__cta { width: 100%; diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_ezuser.scss b/src/bundle/Resources/public/scss/fieldType/edit/_ezuser.scss index 2d74991c23..34b4383868 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_ezuser.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_ezuser.scss @@ -4,7 +4,6 @@ .ibexa-data-source { max-width: 80%; - padding-top: calculateRem(24px); .ibexa-data-source__field:first-of-type { .ibexa-label { diff --git a/src/bundle/Resources/public/scss/mixins/_containers.scss b/src/bundle/Resources/public/scss/mixins/_containers.scss index bf1058af0d..98b427bf5b 100644 --- a/src/bundle/Resources/public/scss/mixins/_containers.scss +++ b/src/bundle/Resources/public/scss/mixins/_containers.scss @@ -1,7 +1,7 @@ @mixin edit-right-side-container { flex-grow: 1; position: relative; - padding: calculateRem(42px) calculateRem(32px) calculateRem(32px) calculateRem(32px); + padding: calculateRem(24px) calculateRem(32px) calculateRem(32px) calculateRem(32px); overflow-y: auto; border-bottom-left-radius: $ibexa-border-radius; border-width: 0 calculateRem(1px) calculateRem(1px); diff --git a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss index 89d935c60a..4ff0a262c5 100644 --- a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss +++ b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss @@ -12,7 +12,6 @@ margin-bottom: 0; padding-bottom: calculateRem(20px); border-bottom: calculateRem(1px) solid $ibexa-color-dark-200; - margin-top: 0; &__headline { overflow: initial; diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig index cf01d2ac25..0950102336 100644 --- a/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/change_password/form_fields.html.twig @@ -4,7 +4,7 @@ {% block form_row -%} {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({'class': (widget_wrapper_attr.class|default('') ~ ' ibexa-field__data')|trim}) %} - {% set wrapper_class = 'ibexa-field form-group' %} + {% set wrapper_class = 'ibexa-field ibexa-form-field form-group' %} {% if required %}{% set wrapper_class = (wrapper_class|default('') ~ ' ibexa-field--required')|trim %}{% endif %} {% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %} diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig index 189f94aaad..011ca9de35 100644 --- a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig @@ -22,7 +22,7 @@ {{ form_start(form_change_user_password, {'attr': {'class': 'ibexa-form-validate'}}) }}
-
+
{{ form_row(form_change_user_password.oldPassword) }} {{ form_row(form_change_user_password.newPassword) }}
diff --git a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig index 1a98ba6fd7..86b3373c3f 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig @@ -22,9 +22,10 @@ {{ form_start(form) }} {{ form_widget(form.identifier, {'attr': {'hidden': 'hidden'}}) }} {% for user_setting in user_setting_group.settings %} -
- {{ form_widget(attribute(form, user_setting.identifier)) }} -
+ {{ form_widget( + attribute(form, user_setting.identifier), + { attr: { class: 'ibexa-edit-content__field ibexa-form-field' ~ (loop.last ? ' ibexa-form-field--last') }} + ) }} {% endfor %} {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.update_and_edit, { attr: { hidden: 'hidden' }}) }} diff --git a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig index a5ec2e3b10..f5777cd01d 100644 --- a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig @@ -38,7 +38,7 @@ {% block form_fields %}
-
+
{{ parent() }} {{ form_widget(form.publish, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.publishAndEdit, { attr: { hidden: 'hidden' }}) }} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig index 7608a131d3..0669fde922 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig @@ -42,7 +42,7 @@ {% block form_fields %}
-
+
{{ parent() }} {{ form_widget(form.publish, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.publishAndEdit, { attr: { hidden: 'hidden' }}) }} diff --git a/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig b/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig index 677bc0a600..64a0d9fe7b 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig @@ -3,9 +3,9 @@ {% if not formField.rendered %} {% if formField.value is defined %} - {{- form_widget(formField) -}} + {{- form_widget(formField, { attr: { class: 'lala' } }) -}} {% else %} -
+
{{- form_label(formField) -}}

{{ 'content.field.non_editable'|trans|desc('This Field Type is not editable') }} diff --git a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig index 8424033460..a9ae4c1194 100644 --- a/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/form_fields.html.twig @@ -47,18 +47,18 @@ {%- endblock %} {% block form_row_subfield -%} - {% set wrapper_class = 'ibexa-data-source__field ibexa-data-source__field--' ~ name %} - {% if required %}{% set wrapper_class = (wrapper_class ~ ' ibexa-data-source__field--required ibexa-data-source__field--required')|trim %}{% endif %} + {% set wrapper_class = 'ibexa-data-source__field ibexa-data-source__field--' ~ name ~ ' ibexa-data-form-field' %} + {% if required %}{% set wrapper_class = (wrapper_class ~ ' ibexa-data-source__field--required')|trim %}{% endif %} {% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-data-source__label ibexa-data-source__label')|trim}) %} - {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ ' ibexa-data-source__label-wrapper ibexa-data-source__label-wrapper')|trim}) %} + {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-data-source__label')|trim}) %} + {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ ' ibexa-data-source__label-wrapper')|trim}) %} {% set attr = attr|merge({ - class: (attr.class|default('') ~ ' ibexa-data-source__input ibexa-data-source__input ibexa-input--small')|trim, + class: (attr.class|default('') ~ ' ibexa-data-source__input ibexa-input--small')|trim, is_small: true, }) %} {% set wrapper_attr = wrapper_attr|default({})|merge({class: (wrapper_attr.class|default('') ~ ' ' ~ wrapper_class)|trim}) %} - {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({class: (widget_wrapper_attr.class|default('') ~ ' ibexa-data-source__input-wrapper ibexa-data-source__input-wrapper')|trim}) %} + {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({class: (widget_wrapper_attr.class|default('') ~ ' ibexa-data-source__input-wrapper')|trim}) %} {% if required %}{% set label_attr = label_attr|merge({'class': label_attr.class ~ ' required' }) %}{% endif %} @@ -82,11 +82,11 @@ {% set fieldtype_is_not_translatable = translation_mode and not fieldtype.vars.value.fieldDefinition.isTranslatable %} {% set has_distraction_free_mode = fieldtype_identifier == 'ezrichtext' %} - {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({'class': (widget_wrapper_attr.class|default('') ~ ' ibexa-field-edit__data ibexa-field-edit__data')|trim}) %} - {% set wrapper_class = 'ibexa-field-edit ibexa-field-edit--' ~ fieldtype_identifier ~ ' ibexa-field-edit ibexa-field-edit--' ~ fieldtype_identifier ~ (has_distraction_free_mode ? ' ibexa-field-edit--has-distraction-free-mode') %} + {% set widget_wrapper_attr = widget_wrapper_attr|default({})|merge({'class': (widget_wrapper_attr.class|default('') ~ ' ibexa-field-edit__data')|trim}) %} + {% set wrapper_class = 'ibexa-field-edit ibexa-form-field ibexa-field-edit--' ~ fieldtype_identifier ~ (has_distraction_free_mode ? ' ibexa-field-edit--has-distraction-free-mode') %} {% if fieldtype.vars.disabled %} - {% set wrapper_class = wrapper_class ~ ' ibexa-field-edit--disabled ibexa-field-edit--disabled' %} + {% set wrapper_class = wrapper_class ~ ' ibexa-field-edit--disabled' %} {% set attr = attr|merge({'readonly': 'readonly'}) %} {% endif %} @@ -97,15 +97,15 @@ {% endif %} {% endfor %} - {% if required %}{% set wrapper_class = (wrapper_class|default('') ~ ' ibexa-field-edit--required ibexa-field-edit--required')|trim %}{% endif %} + {% if required %}{% set wrapper_class = (wrapper_class|default('') ~ ' ibexa-field-edit--required')|trim %}{% endif %} {% if errors|length > 0 %}{% set wrapper_class = (wrapper_class|default('') ~ ' is-invalid')|trim %}{% endif %} {% if fieldtype_is_not_translatable %} - {% set wrapper_class = (wrapper_class|default('') ~ ' ibexa-field-edit--nontranslatable ibexa-field-edit--nontranslatable')|trim %} + {% set wrapper_class = (wrapper_class|default('') ~ ' ibexa-field-edit--nontranslatable')|trim %} {% set attr = attr|merge({'readonly': 'readonly'}) %} {% endif %} - {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ 'ibexa-field-edit__label-wrapper ibexa-field-edit__label-wrapper')|trim}) %} - {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-field-edit__label ibexa-field-edit__label')|trim}) %} - {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-data-source__input ibexa-data-source__input')|trim}) %} + {% set label_wrapper_attr = label_wrapper_attr|default({})|merge({'class': (label_wrapper_attr.class|default('') ~ 'ibexa-field-edit__label-wrapper')|trim}) %} + {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' ibexa-label ibexa-field-edit__label')|trim}) %} + {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ibexa-data-source__input')|trim}) %} {% set wrapper_attr = wrapper_attr|default({})|merge({'class': (wrapper_attr.class|default('') ~ ' ' ~ wrapper_class)|trim}) %} {% set field_type_descriptions = fieldtype.vars.value.fieldDefinition.descriptions %} @@ -133,7 +133,7 @@ {% endif %} {% if fieldtype_is_not_translatable %} -

{{ 'fieldtype.translation_is_disabled'|trans({'%fieldName%': label})|desc('Translating the %fieldName% Field is disabled. See content type definition for details.') }}

+

{{ 'fieldtype.translation_is_disabled'|trans({'%fieldName%': label})|desc('Translating the %fieldName% Field is disabled. See content type definition for details.') }}

{% endif %} {% set description = field_type_descriptions[fieldtype.vars.languageCode]|default(field_type_descriptions|first) %} diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig index 360175b6a8..42bfed0584 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/create.html.twig @@ -23,7 +23,7 @@
- {{ form_row(form.identifier, {'attr': {'autofocus': 'autofocus'}}) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' }, attr: {'autofocus': 'autofocus'} }) }}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig index d28998ac7c..04d514c73e 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/edit.html.twig @@ -24,7 +24,7 @@
- {{ form_row(form.identifier) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/create.html.twig b/src/bundle/Resources/views/themes/admin/content_type/create.html.twig index 15bb95c916..8104dc1947 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/create.html.twig @@ -49,15 +49,15 @@ {% endblock %} {% block left_column %} - {{ form_row(form.name) }} - {{ form_row(form.identifier) }} - {{ form_row(form.description) }} - {{ form_row(form.nameSchema) }} - {{ form_row(form.urlAliasSchema) }} - {{ form_row(form.isContainer) }} - {{ form_row(form.defaultSortField) }} - {{ form_row(form.defaultSortOrder) }} - {{ form_row(form.defaultAlwaysAvailable) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.description, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.nameSchema, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.urlAliasSchema, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.isContainer, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.defaultSortField, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.defaultSortOrder, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {{ form_row(form.defaultAlwaysAvailable, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} {% endblock %} {% endembed %}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig index d587792c03..eaea229e4d 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig @@ -55,15 +55,15 @@ {% endblock %} {% block left_column %} - {{ form_row(form.name) }} - {{ form_row(form.identifier) }} - {{ form_row(form.description) }} - {{ form_row(form.nameSchema) }} - {{ form_row(form.urlAliasSchema) }} - {{ form_row(form.isContainer) }} - {{ form_row(form.defaultSortField) }} - {{ form_row(form.defaultSortOrder) }} - {{ form_row(form.defaultAlwaysAvailable) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.description, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.nameSchema, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.urlAliasSchema, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.isContainer, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.defaultSortField, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.defaultSortOrder, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {{ form_row(form.defaultAlwaysAvailable, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} {% endblock %} {% endembed %}
diff --git a/src/bundle/Resources/views/themes/admin/language/create.html.twig b/src/bundle/Resources/views/themes/admin/language/create.html.twig index 50d1c2acf5..9c2d2f7eaa 100644 --- a/src/bundle/Resources/views/themes/admin/language/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/create.html.twig @@ -23,9 +23,9 @@
- {{ form_row(form.name, {'attr': {'autofocus': 'autofocus'}}) }} - {{ form_row(form.languageCode) }} - {{ form_row(form.enabled, {'label_attr': {'class': 'checkbox-inline'}}) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field' }, attr: {'autofocus': 'autofocus'} }) }} + {{ form_row(form.languageCode, { row_attr: { class: 'ibexa-form-field ibexa-form-field--last' } }) }} + {{ form_row(form.enabled, { row_attr: { class: 'ibexa-form-field' }, label_attr: { class: 'checkbox-inline' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/language/edit.html.twig b/src/bundle/Resources/views/themes/admin/language/edit.html.twig index 1e96cfc7bd..4c955f87ba 100644 --- a/src/bundle/Resources/views/themes/admin/language/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/edit.html.twig @@ -22,8 +22,8 @@
- {{ form_row(form.name) }} - {{ form_row(form.enabled, {'label_attr': {'class': 'checkbox-inline'}}) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field ibexa-form-field--last' } }) }} + {{ form_row(form.enabled, { row_attr: { class: 'ibexa-form-field' }, label_attr: {'class': 'checkbox-inline'}}) }}
diff --git a/src/bundle/Resources/views/themes/admin/object_state/add.html.twig b/src/bundle/Resources/views/themes/admin/object_state/add.html.twig index c91dc0367a..3d5431b0ef 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/add.html.twig @@ -23,8 +23,8 @@
- {{ form_row(form.name, {'attr': {'autofocus': 'autofocus'}}) }} - {{ form_row(form.identifier) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field' } , attr: {'autofocus': 'autofocus'}}) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig b/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig index 30bbe90040..a6d42c7517 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/edit.html.twig @@ -25,8 +25,8 @@
- {{ form_row(form.name) }} - {{ form_row(form.identifier) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field' } }) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig index 0161241429..900399820e 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/add.html.twig @@ -19,8 +19,8 @@
- {{ form_row(form.name, {'attr': {'autofocus': 'autofocus'}}) }} - {{ form_row(form.identifier) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field' }, attr : {'autofocus': 'autofocus'} }) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig index 3f272e9526..670514192f 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/edit.html.twig @@ -24,8 +24,8 @@
- {{ form_row(form.name) }} - {{ form_row(form.identifier) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field' } }) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/section/create.html.twig b/src/bundle/Resources/views/themes/admin/section/create.html.twig index 286b87a563..301f76a980 100644 --- a/src/bundle/Resources/views/themes/admin/section/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/create.html.twig @@ -18,8 +18,8 @@ {{ form_start(form_section_create) }}
- {{ form_row(form_section_create.name, {'attr': {'autofocus': 'autofocus'}}) }} - {{ form_row(form_section_create.identifier) }} + {{ form_row(form_section_create.name, { row_attr: { class: 'ibexa-form-field' }, attr: {'autofocus': 'autofocus'} }) }} + {{ form_row(form_section_create.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
{{ form_widget(form_section_create.create, {'attr': {'hidden': 'hidden'}}) }} diff --git a/src/bundle/Resources/views/themes/admin/section/update.html.twig b/src/bundle/Resources/views/themes/admin/section/update.html.twig index 82f72118b2..aff99ec47f 100644 --- a/src/bundle/Resources/views/themes/admin/section/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/update.html.twig @@ -19,8 +19,8 @@
- {{ form_row(form_section_update.name) }} - {{ form_row(form_section_update.identifier) }} + {{ form_row(form_section_update.name, { row_attr: { class: 'ibexa-form-field' } }) }} + {{ form_row(form_section_update.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig index 6d714730ed..c734a6a892 100644 --- a/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/edit_header.html.twig @@ -27,11 +27,6 @@
-
- -
- -

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig index 25368fe36a..d03d434e55 100644 --- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig @@ -478,13 +478,12 @@ {%- endblock %} {% block content_type_field_definition_widget -%} - {{- form_row(form.enabled, { label: 'meta.enabled'|trans({ - '%type%': form.name.vars.value, - }, 'ibexa_content_type')|desc('Enable %type% for this content type') }) -}} - + {{- form_row(form.enabled, { + label: 'meta.enabled'|trans({ '%type%': form.name.vars.value }, 'ibexa_content_type')|desc('Enable %type% for this content type') + }) -}} {% for form_field in form.children %} {% if form_field.isRendered() == false %} - {{ form_row(form_field) }} + {{ form_row(form_field, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' ~ (form_field.vars.name == 'isThumbnail' ? ' ibexa-form-field--last') }} ) }} {% endif %} {% endfor %} {%- endblock %} @@ -492,14 +491,14 @@ {% block content_type_meta_field_definition_enabled_row -%} {% use '@ibexadesign/ui/form_fields/toggle_widget.html.twig' %} -
+
{{ block('form_label') }} {{ block('toggle_widget') }}
{%- endblock %} {% block seo_field_row -%} -

{{- label -}}

+

{{- label -}}

{{- form_widget(form) -}} {{- form_help(form) -}}
diff --git a/src/bundle/Resources/views/themes/admin/user/create.html.twig b/src/bundle/Resources/views/themes/admin/user/create.html.twig index bb7cf44902..20ff30427e 100644 --- a/src/bundle/Resources/views/themes/admin/user/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/create.html.twig @@ -27,7 +27,7 @@ {% block form_fields %}
-
+
{{ parent() }} {{ form_widget(form.create, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.cancel, {'attr': {'hidden': 'hidden'}}) }} diff --git a/src/bundle/Resources/views/themes/admin/user/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/edit.html.twig index 8b41a524b3..45f7714d4f 100644 --- a/src/bundle/Resources/views/themes/admin/user/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/edit.html.twig @@ -28,7 +28,7 @@ {% block form_fields %}
-
+
{{ parent() }} {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.cancel, {'attr': {'hidden': 'hidden'}}) }} diff --git a/src/bundle/Resources/views/themes/admin/user/role/add.html.twig b/src/bundle/Resources/views/themes/admin/user/role/add.html.twig index 2fd5857137..2d7e3ba1b9 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/add.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/add.html.twig @@ -22,7 +22,7 @@
- {{ form_row(form.identifier, {'attr': {'autofocus': 'autofocus'}}) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' }, attr: {'autofocus': 'autofocus'}}) }}
diff --git a/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig b/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig index f2bd0aae3c..c64db015f9 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/copy.html.twig @@ -19,7 +19,7 @@
- {{ form_row(form.new_identifier, {'attr': {'autofocus': 'autofocus'}}) }} + {{ form_row(form.new_identifier, { row_attr: { class: 'ibexa-form-field' }, attr: {'autofocus': 'autofocus'}}) }}
diff --git a/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig index 19048378e3..6433ac4735 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/edit.html.twig @@ -23,7 +23,7 @@
- {{ form_row(form.identifier) }} + {{ form_row(form.identifier, { row_attr: { class: 'ibexa-form-field' } }) }}
From 07f0e70380a466d68e13db1639ff8027c9e4ce96 Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:06:56 +0100 Subject: [PATCH 2/9] Changes after CR --- .../public/scss/fieldType/edit/_base-field.scss | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss index 1451ff140e..4c067a3470 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss @@ -235,15 +235,7 @@ } } -.ibexa-form-field { - margin-bottom: calculateRem(24px); - - &:last-child, - &--last { - margin-bottom: 0; - } -} - +.ibexa-form-field, .ibexa-data-form-field { margin-bottom: calculateRem(24px); From 32b6141139efe53ee3e8904086c457141d3ca055 Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Thu, 28 Mar 2024 14:16:23 +0100 Subject: [PATCH 3/9] Updated ibexa-card__body --- src/bundle/Resources/public/scss/_card.scss | 4 ---- .../themes/admin/account/change_password/index.html.twig | 4 ++-- .../views/themes/admin/content/create/create.html.twig | 4 ++-- .../Resources/views/themes/admin/content/edit/edit.html.twig | 4 ++-- src/bundle/Resources/views/themes/admin/user/create.html.twig | 4 ++-- src/bundle/Resources/views/themes/admin/user/edit.html.twig | 4 ++-- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/bundle/Resources/public/scss/_card.scss b/src/bundle/Resources/public/scss/_card.scss index ebb6cfc4ff..0b76fd7d07 100644 --- a/src/bundle/Resources/public/scss/_card.scss +++ b/src/bundle/Resources/public/scss/_card.scss @@ -201,7 +201,3 @@ } } } - -.ibexa-card-body { - padding: 0; -} diff --git a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig index 011ca9de35..d881220ae8 100644 --- a/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/change_password/index.html.twig @@ -21,8 +21,8 @@
{{ form_start(form_change_user_password, {'attr': {'class': 'ibexa-form-validate'}}) }}
-
-
+
+
{{ form_row(form_change_user_password.oldPassword) }} {{ form_row(form_change_user_password.newPassword) }}
diff --git a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig index f5777cd01d..10bf1f1b84 100644 --- a/src/bundle/Resources/views/themes/admin/content/create/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/create/create.html.twig @@ -37,8 +37,8 @@ {% block form_fields %}
-
-
+
+
{{ parent() }} {{ form_widget(form.publish, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.publishAndEdit, { attr: { hidden: 'hidden' }}) }} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig index 0669fde922..accb2b4b35 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit/edit.html.twig @@ -41,8 +41,8 @@ {% endblock %} {% block form_fields %} -
-
+
+
{{ parent() }} {{ form_widget(form.publish, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.publishAndEdit, { attr: { hidden: 'hidden' }}) }} diff --git a/src/bundle/Resources/views/themes/admin/user/create.html.twig b/src/bundle/Resources/views/themes/admin/user/create.html.twig index 20ff30427e..4dd41ad85d 100644 --- a/src/bundle/Resources/views/themes/admin/user/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/create.html.twig @@ -26,8 +26,8 @@ {% block form_fields %}
-
-
+
+
{{ parent() }} {{ form_widget(form.create, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.cancel, {'attr': {'hidden': 'hidden'}}) }} diff --git a/src/bundle/Resources/views/themes/admin/user/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/edit.html.twig index 45f7714d4f..091bec925e 100644 --- a/src/bundle/Resources/views/themes/admin/user/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/edit.html.twig @@ -27,8 +27,8 @@ {% block form_fields %}
-
-
+
+
{{ parent() }} {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }} {{ form_widget(form.cancel, {'attr': {'hidden': 'hidden'}}) }} From dcaa40bdca3ca0341af3ed0881278c2c7a9b9de1 Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:06:56 +0200 Subject: [PATCH 4/9] Removed lala --- .../Resources/views/themes/admin/content/edit_macros.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig b/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig index 64a0d9fe7b..035a86a11a 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit_macros.html.twig @@ -3,7 +3,7 @@ {% if not formField.rendered %} {% if formField.value is defined %} - {{- form_widget(formField, { attr: { class: 'lala' } }) -}} + {{- form_widget(formField) -}} {% else %}
{{- form_label(formField) -}} From a24b34b8f85b35facd15bbc71f4067e7aadd56ce Mon Sep 17 00:00:00 2001 From: Robert Swoboda <53216935+Gengar-i@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:18:48 +0200 Subject: [PATCH 5/9] Remove promote img --- src/bundle/Resources/public/img/qualifio-promote.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/bundle/Resources/public/img/qualifio-promote.svg diff --git a/src/bundle/Resources/public/img/qualifio-promote.svg b/src/bundle/Resources/public/img/qualifio-promote.svg deleted file mode 100644 index 92a4ce7750..0000000000 --- a/src/bundle/Resources/public/img/qualifio-promote.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 77089a6dea53465aaf4efedd1df6f293c0b88ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Thu, 9 May 2024 16:16:46 +0200 Subject: [PATCH 6/9] after review: changed class-name, added extra variable --- .../scss/fieldType/edit/_base-field.scss | 2 +- .../admin/account/settings/update.html.twig | 2 +- .../admin/content_type/create.html.twig | 20 ++++++++++--------- .../themes/admin/content_type/edit.html.twig | 20 ++++++++++--------- .../themes/admin/language/create.html.twig | 2 +- .../themes/admin/language/edit.html.twig | 2 +- .../themes/admin/ui/form_fields.html.twig | 2 +- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss index 4c067a3470..698acf31b7 100644 --- a/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss +++ b/src/bundle/Resources/public/scss/fieldType/edit/_base-field.scss @@ -240,7 +240,7 @@ margin-bottom: calculateRem(24px); &:last-child, - &--last { + &--no-bottom-margin { margin-bottom: 0; } } diff --git a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig index 86b3373c3f..3ef7954e80 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/update.html.twig @@ -24,7 +24,7 @@ {% for user_setting in user_setting_group.settings %} {{ form_widget( attribute(form, user_setting.identifier), - { attr: { class: 'ibexa-edit-content__field ibexa-form-field' ~ (loop.last ? ' ibexa-form-field--last') }} + { attr: { class: 'ibexa-edit-content__field ibexa-form-field' ~ (loop.last ? ' ibexa-form-field--no-bottom-margin') }} ) }} {% endfor %} {{ form_widget(form.update, {'attr': {'hidden': 'hidden'}}) }} diff --git a/src/bundle/Resources/views/themes/admin/content_type/create.html.twig b/src/bundle/Resources/views/themes/admin/content_type/create.html.twig index 8104dc1947..24ec499a88 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/create.html.twig @@ -49,15 +49,17 @@ {% endblock %} {% block left_column %} - {{ form_row(form.name, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.identifier, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.description, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.nameSchema, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.urlAliasSchema, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.isContainer, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.defaultSortField, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.defaultSortOrder, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} - {{ form_row(form.defaultAlwaysAvailable, { row_attr: { class: 'ibexa-content-type-edit__field ibexa-form-field' }}) }} + {% set form_field_options = { row_attr: { class: 'ibexa-form-field' } } %} + + {{ form_row(form.name, form_field_options) }} + {{ form_row(form.identifier, form_field_options) }} + {{ form_row(form.description, form_field_options) }} + {{ form_row(form.nameSchema, form_field_options) }} + {{ form_row(form.urlAliasSchema, form_field_options) }} + {{ form_row(form.isContainer, form_field_options) }} + {{ form_row(form.defaultSortField, form_field_options) }} + {{ form_row(form.defaultSortOrder, form_field_options) }} + {{ form_row(form.defaultAlwaysAvailable, form_field_options) }} {% endblock %} {% endembed %}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig index eaea229e4d..6621787597 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig @@ -55,15 +55,17 @@ {% endblock %} {% block left_column %} - {{ form_row(form.name, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.identifier, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.description, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.nameSchema, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.urlAliasSchema, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.isContainer, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.defaultSortField, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.defaultSortOrder, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} - {{ form_row(form.defaultAlwaysAvailable, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' }}) }} + {% set form_field_options = { row_attr: { class: 'ibexa-form-field' } } %} + + {{ form_row(form.name, form_field_options) }} + {{ form_row(form.identifier, form_field_options) }} + {{ form_row(form.description, form_field_options) }} + {{ form_row(form.nameSchema, form_field_options) }} + {{ form_row(form.urlAliasSchema, form_field_options) }} + {{ form_row(form.isContainer, form_field_options) }} + {{ form_row(form.defaultSortField, form_field_options) }} + {{ form_row(form.defaultSortOrder, form_field_options) }} + {{ form_row(form.defaultAlwaysAvailable, form_field_options) }} {% endblock %} {% endembed %}
diff --git a/src/bundle/Resources/views/themes/admin/language/create.html.twig b/src/bundle/Resources/views/themes/admin/language/create.html.twig index 9c2d2f7eaa..cdbdd4887f 100644 --- a/src/bundle/Resources/views/themes/admin/language/create.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/create.html.twig @@ -24,7 +24,7 @@
{{ form_row(form.name, { row_attr: { class: 'ibexa-form-field' }, attr: {'autofocus': 'autofocus'} }) }} - {{ form_row(form.languageCode, { row_attr: { class: 'ibexa-form-field ibexa-form-field--last' } }) }} + {{ form_row(form.languageCode, { row_attr: { class: 'ibexa-form-field ibexa-form-field--no-bottom-margin' } }) }} {{ form_row(form.enabled, { row_attr: { class: 'ibexa-form-field' }, label_attr: { class: 'checkbox-inline' } }) }}
diff --git a/src/bundle/Resources/views/themes/admin/language/edit.html.twig b/src/bundle/Resources/views/themes/admin/language/edit.html.twig index 4c955f87ba..29b33cddc5 100644 --- a/src/bundle/Resources/views/themes/admin/language/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/edit.html.twig @@ -22,7 +22,7 @@
- {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field ibexa-form-field--last' } }) }} + {{ form_row(form.name, { row_attr: { class: 'ibexa-form-field ibexa-form-field--no-bottom-margin' } }) }} {{ form_row(form.enabled, { row_attr: { class: 'ibexa-form-field' }, label_attr: {'class': 'checkbox-inline'}}) }}
diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig index d03d434e55..eac49f040c 100644 --- a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig @@ -483,7 +483,7 @@ }) -}} {% for form_field in form.children %} {% if form_field.isRendered() == false %} - {{ form_row(form_field, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' ~ (form_field.vars.name == 'isThumbnail' ? ' ibexa-form-field--last') }} ) }} + {{ form_row(form_field, { row_attr: { class: 'ibexa-content-type-edit__form-field ibexa-form-field' ~ (form_field.vars.name == 'isThumbnail' ? ' ibexa-form-field--no-bottom-margin') }} ) }} {% endif %} {% endfor %} {%- endblock %} From 316a3cf58ec4254dba2747c9306aa3c1220aa0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Mon, 27 May 2024 13:44:12 +0200 Subject: [PATCH 7/9] modal margins --- src/bundle/Resources/public/scss/_custom.scss | 4 ++-- src/bundle/Resources/public/scss/mixins/_modals.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bundle/Resources/public/scss/_custom.scss b/src/bundle/Resources/public/scss/_custom.scss index 344a38a7d5..0bc0184eea 100644 --- a/src/bundle/Resources/public/scss/_custom.scss +++ b/src/bundle/Resources/public/scss/_custom.scss @@ -309,7 +309,7 @@ $pagination-disabled-bg: transparent; $pagination-disabled-border-color: transparent; // Modals -$modal-header-padding-y: calculateRem(16px); +$modal-header-padding-y: calculateRem(26px); $modal-header-padding-x: 0; $modal-header-border-width: calculateRem(1px); $modal-header-border-color: $ibexa-color-light-500; @@ -317,7 +317,7 @@ $modal-title-font-size: calculateRem(28px); $modal-content-border-width: 0; $modal-content-border-radius: $ibexa-border-radius; $modal-inner-padding: calculateRem(24px); -$modal-footer-padding: calculateRem(24px) 0; +$modal-footer-padding: calculateRem(40px) 0 calculateRem(32px); $modal-footer-border-width: 0; //Components $border-radius: $ibexa-border-radius; diff --git a/src/bundle/Resources/public/scss/mixins/_modals.scss b/src/bundle/Resources/public/scss/mixins/_modals.scss index 4ef706862d..386620b4e9 100644 --- a/src/bundle/Resources/public/scss/mixins/_modals.scss +++ b/src/bundle/Resources/public/scss/mixins/_modals.scss @@ -6,7 +6,7 @@ } @mixin modal-content() { - padding: 0 calculateRem(24px); + padding: 0 calculateRem(32px); } @mixin modal-header() { @@ -34,7 +34,7 @@ position: absolute; display: block; align-items: center; - top: calculateRem(24px); + top: calculateRem(34px); right: 0; cursor: pointer; opacity: 1; From 9d97ae78abe341696d5292124cbde0d88922f059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Mon, 27 May 2024 14:10:25 +0200 Subject: [PATCH 8/9] pages spacings --- .../Resources/public/scss/_adaptive-filters.scss | 10 ++++------ src/bundle/Resources/public/scss/_general.scss | 2 +- src/bundle/Resources/public/scss/_header.scss | 2 +- src/bundle/Resources/public/scss/_main-container.scss | 4 ++++ src/bundle/Resources/public/scss/_tables.scss | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/bundle/Resources/public/scss/_adaptive-filters.scss b/src/bundle/Resources/public/scss/_adaptive-filters.scss index 816f5ecdcb..56754362c6 100644 --- a/src/bundle/Resources/public/scss/_adaptive-filters.scss +++ b/src/bundle/Resources/public/scss/_adaptive-filters.scss @@ -1,14 +1,12 @@ .ibexa-adaptive-filters { display: flex; flex-direction: column; - padding: calculateRem(4px) calculateRem(16px) 0 calculateRem(16px); + padding: calculateRem(24px) calculateRem(24px) 0; border-radius: $ibexa-border-radius; border: calculateRem(1px) solid $ibexa-color-light; box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.05); &--no-labels { - padding-top: calculateRem(16px); - .ibexa-adaptive-filters { &__items { height: 0; @@ -26,7 +24,7 @@ } &--inside-container { - margin: calculateRem(-33px) calculateRem(-33px) calculateRem(24px) calculateRem(-33px); + margin: calculateRem(-25px) calculateRem(-25px) calculateRem(24px) calculateRem(-25px); } &--inside-tabs { @@ -39,7 +37,7 @@ display: flex; align-items: flex-end; width: 100%; - margin-bottom: calculateRem(16px); + margin-bottom: calculateRem(24px); } &__static-left { @@ -99,7 +97,7 @@ &__collapsible-content { display: flex; flex-wrap: wrap; - padding: calculateRem(8px) 0 calculateRem(16px); + padding: calculateRem(24px) 0; opacity: 1; transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; diff --git a/src/bundle/Resources/public/scss/_general.scss b/src/bundle/Resources/public/scss/_general.scss index 0ba418ee88..f20f6728f7 100644 --- a/src/bundle/Resources/public/scss/_general.scss +++ b/src/bundle/Resources/public/scss/_general.scss @@ -191,7 +191,7 @@ select { } .ibexa-container { - padding: calculateRem(32px); + padding: calculateRem(24px); background: $ibexa-color-white; border: calculateRem(1px) solid $ibexa-color-light; border-radius: $ibexa-border-radius; diff --git a/src/bundle/Resources/public/scss/_header.scss b/src/bundle/Resources/public/scss/_header.scss index d313ef677b..7ea69af7d4 100644 --- a/src/bundle/Resources/public/scss/_header.scss +++ b/src/bundle/Resources/public/scss/_header.scss @@ -19,7 +19,7 @@ .ibexa-page-header-wrapper { display: flex; flex-wrap: wrap; - padding: calculateRem(20px) 0; + padding: calculateRem(24px) 0 calculateRem(28px); .ibexa-breadcrums-wrapper, .ibexa-content-menu-wrapper { diff --git a/src/bundle/Resources/public/scss/_main-container.scss b/src/bundle/Resources/public/scss/_main-container.scss index c9061551a1..c907aec128 100644 --- a/src/bundle/Resources/public/scss/_main-container.scss +++ b/src/bundle/Resources/public/scss/_main-container.scss @@ -13,6 +13,10 @@ height: 100%; overflow-y: auto; box-shadow: $ibexa-edit-content-box-shadow; + + & > .container { + padding: 0 calculateRem(32px); + } } &--edit-container { diff --git a/src/bundle/Resources/public/scss/_tables.scss b/src/bundle/Resources/public/scss/_tables.scss index dd7e258699..43b518ef6b 100644 --- a/src/bundle/Resources/public/scss/_tables.scss +++ b/src/bundle/Resources/public/scss/_tables.scss @@ -272,7 +272,7 @@ display: flex; justify-content: space-between; align-items: center; - padding-bottom: calculateRem(8px); + padding-bottom: calculateRem(24px); border-bottom: calculateRem(1px) solid $ibexa-color-dark-200; &__headline { From c0fd8ade22aa68bf2db0b2e54ddea246e51db119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grabowski?= Date: Mon, 17 Jun 2024 16:28:26 +0200 Subject: [PATCH 9/9] remove margin left; change width over fullhd --- src/bundle/Resources/public/scss/_general.scss | 4 ++++ src/bundle/Resources/public/scss/_main-container.scss | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/bundle/Resources/public/scss/_general.scss b/src/bundle/Resources/public/scss/_general.scss index f20f6728f7..ff316d1fc4 100644 --- a/src/bundle/Resources/public/scss/_general.scss +++ b/src/bundle/Resources/public/scss/_general.scss @@ -197,6 +197,10 @@ select { border-radius: $ibexa-border-radius; box-shadow: $ibexa-edit-header-box-shadow; margin-bottom: calculateRem(32px); + + @media (min-width: 1921px) { + max-width: 2000px; + } } .ibexa-error-site { diff --git a/src/bundle/Resources/public/scss/_main-container.scss b/src/bundle/Resources/public/scss/_main-container.scss index c907aec128..560149b9ff 100644 --- a/src/bundle/Resources/public/scss/_main-container.scss +++ b/src/bundle/Resources/public/scss/_main-container.scss @@ -16,6 +16,11 @@ & > .container { padding: 0 calculateRem(32px); + margin-left: 0; + + @media (min-width: 1921px) { + max-width: 2000px; + } } }