yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with active style affected nested block list elements

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2021-03-21 15:14:01 +01:00
committed by Nathan Woulfe
parent b783399c5c
commit 349c5ac3ab
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/blocklistentryeditors/inlineblock/inlineblock.editor.less
View File

@@ -45,18 +45,6 @@
}
}
.umb-block-list__block.--active & {
border-color: @gray-8;
box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.05);
> button {
> .caret {
transform: rotate(0deg);
}
}
}
ng-form.ng-invalid-val-server-match-content > .umb-block-list__block > .umb-block-list__block--content > div > & {
> button {
color: @formErrorText;
@@ -104,6 +92,22 @@
}
}
.umb-block-list__block.--active {
border-color: @gray-8;
box-shadow: 0 0 2px 0px rgba(0, 0, 0, 0.05);
> .umb-block-list__block--content {
> .umb-block-list__block--view {
> .blockelement-inlineblock-editor {
> button {
> .caret {
transform: rotate(0deg);
}
}
}
}
}
}
.blockelement-inlineblock-editor__inner {
border-top: 1px solid @gray-8;

1
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.html
View File

@@ -61,5 +61,4 @@
model="vm.blockTypePicker">
</umb-overlay>
</div>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbblocklistblock.component.js
View File

@@ -59,12 +59,12 @@
<style>
@import "${model.stylesheet}"
</style>
<div ng-include="'${model.view}'"></div>
<div class="umb-block-list__block--view" ng-include="'${model.view}'"></div>
`;
$compile(shadowRoot)($scope);
}
else {
$element.append($compile('<div ng-include="model.view"></div>')($scope));
$element.append($compile('<div class="umb-block-list__block--view" ng-include="model.view"></div>')($scope));
}
};