From 2b6016ce82f4f613dfd9413d7548fb2883d633d5 Mon Sep 17 00:00:00 2001 From: Dariusz Szut Date: Tue, 1 Feb 2022 09:43:56 +0100 Subject: [PATCH] IBX-1498: Disabled drag and drop, fields in content type translate (#277) --- .../public/scss/_content-type-edit.scss | 24 ++++++++++++------- .../Resources/public/scss/_dropdown.scss | 2 +- .../public/scss/mixins/_drag-and-drop.scss | 5 +++- .../available_field_types.html.twig | 2 +- .../themes/admin/content_type/edit.html.twig | 8 +++++-- .../content_type/field_definition.html.twig | 2 +- .../content_type/field_definitions.html.twig | 2 +- .../nontranslatable_fields_disabled.html.twig | 2 +- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/bundle/Resources/public/scss/_content-type-edit.scss b/src/bundle/Resources/public/scss/_content-type-edit.scss index 3050cc9ead..0bec23586d 100644 --- a/src/bundle/Resources/public/scss/_content-type-edit.scss +++ b/src/bundle/Resources/public/scss/_content-type-edit.scss @@ -87,10 +87,6 @@ .ibexa-btn { padding: calculateRem(10px); } - - &:hover { - cursor: grab; - } } &__header-label { @@ -106,10 +102,6 @@ margin-left: auto; } - &__toggle-btn:not(.ibexa-collapse__toggle-btn--status) { - cursor: grab; - } - &__draggable-btn { cursor: grab; @@ -118,6 +110,22 @@ } } } + + &.ibexa-collapse { + &[draggable='true'] { + .ibexa-collapse { + &__header { + &:hover { + cursor: grab; + } + } + + &__toggle-btn:not(.ibexa-collapse__toggle-btn--status) { + cursor: grab; + } + } + } + } } } diff --git a/src/bundle/Resources/public/scss/_dropdown.scss b/src/bundle/Resources/public/scss/_dropdown.scss index cba6377c24..cc8462912d 100644 --- a/src/bundle/Resources/public/scss/_dropdown.scss +++ b/src/bundle/Resources/public/scss/_dropdown.scss @@ -133,7 +133,7 @@ } } - &--single &__selected-item:not(&__selected-placeholder) { + &--single:not(&--disabled) &__selected-item:not(&__selected-placeholder) { color: $ibexa-color-dark; } diff --git a/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss b/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss index ff493e248e..a5f27dd70f 100644 --- a/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss +++ b/src/bundle/Resources/public/scss/mixins/_drag-and-drop.scss @@ -105,7 +105,10 @@ border: calculateRem(1px) solid $ibexa-color-light; border-radius: $ibexa-border-radius; box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(20px) calculateRem(-7px) rgba($ibexa-color-info, 0.05); - cursor: grab; + + &[draggable='true'] { + cursor: grab; + } &:last-of-type { margin-bottom: calculateRem(24px); diff --git a/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig b/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig index bf9a7a3d35..ef2162b1ac 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/available_field_types.html.twig @@ -13,7 +13,7 @@