From eae4ad34fc98325c34e7658b514128ecd824fe73 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Aug 2018 11:13:51 +0100 Subject: [PATCH] Only hide fields that are the direct decendent of the valid matrix block. Goes some way to helping #7 --- src/assetbundles/spoon/dist/css/Spoon.css | 4 ++-- src/assetbundles/spoon/dist/js/FieldManipulator.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assetbundles/spoon/dist/css/Spoon.css b/src/assetbundles/spoon/dist/css/Spoon.css index 44846b0..51e9bbe 100644 --- a/src/assetbundles/spoon/dist/css/Spoon.css +++ b/src/assetbundles/spoon/dist/css/Spoon.css @@ -69,14 +69,14 @@ body.rtl .buttons-spooned > .btn, body.rtl .buttons-spooned > .btngroup { margin */ /* hide all matrix block fields */ -.matrix-field .matrixblock .fields { +.matrix-field > .blocks > .matrixblock > .fields { -webkit-opacity: 0; -moz-opacity: 0; opacity: 0; } /* don’t break blocks that don’t need spooning */ -.matrixblock.matrixblock-not-spooned .fields { +.matrixblock.matrixblock-not-spooned > .fields { -webkit-opacity: 1 !important; -moz-opacity: 1 !important; opacity: 1 !important; diff --git a/src/assetbundles/spoon/dist/js/FieldManipulator.js b/src/assetbundles/spoon/dist/js/FieldManipulator.js index be24a49..dccf132 100755 --- a/src/assetbundles/spoon/dist/js/FieldManipulator.js +++ b/src/assetbundles/spoon/dist/js/FieldManipulator.js @@ -338,7 +338,7 @@ // Make our own fields container and hide the native one, but keep its height var $spoonedFields = $('
').css({ 'opacity' : 0 }).appendTo($matrixBlock), - $fields = $matrixBlock.find('.fields'); + $fields = $matrixBlock.find('> .fields'); $fields.css({ 'opacity' : 0 }); // Wait a bit for the add block animation to finish