Skip to content

Commit

Permalink
Fix issue with active style affected nested block list elements
Browse files Browse the repository at this point in the history
  • Loading branch information
bjarnef authored and nathanwoulfe committed Apr 28, 2021
1 parent b783399 commit 349c5ac
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,4 @@
model="vm.blockTypePicker">
</umb-overlay>


</div>
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
};

Expand Down

0 comments on commit 349c5ac

Please sign in to comment.