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

Add cache buster to injected icons CSS in block grid (#14621)

Browse Source 
* Inject icons css via shadow DOM

* Fix typo

* Import icons.less instead
This commit is contained in:
Bjarne Fyrstenborg
2023-08-01 15:09:10 +02:00
committed by GitHub
parent 96f8f70ed5
commit 8f5fee9f76
6 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html
View File

@@ -1,6 +1,4 @@
<style>
@import 'assets/css/icons.css';
.blockelement-gridblock-editor {
position: relative;
border-radius: 3px;

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridinlineblock/gridinlineblock.editor.html
View File

@@ -1,6 +1,4 @@
<style>
@import 'assets/css/icons.css';
.blockelement-gridinlineblock-editor {
position: relative;
border-radius: 3px;

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridsortblock/gridsortblock.editor.html
View File

@@ -1,6 +1,4 @@
<style>
@import 'assets/css/icons.css';
@keyframes umb-icon-jump {
0%, 100% { transform: rotate(6deg); }
50% { transform: rotate(-6deg); }

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/unsupportedblock/unsupportedblock.editor.html
View File

@@ -1,6 +1,4 @@
<style>
@import 'assets/css/icons.css';
.blockelement-unsupportedblock-editor {
position: relative;
display: block;

3
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
View File

@@ -1,9 +1,8 @@
@import "../../../less/variables.less";
@import "../../../less/mixins.less";
@import "../../../less/helveticons.less";
@import "../../../less/icons.less";
@import "../../../less/buttons.less";
@import "../../../less/accessibility/sr-only.less";
@import "../../../less/components/umb-icon.less";
@umb-block-grid__item_minimum_height: 48px;

6
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridblock.component.js
View File

@@ -49,16 +49,20 @@
var shadowRoot = $element[0].attachShadow({ mode: 'open' });
shadowRoot.innerHTML =
`
<style>@import "assets/css/icons.css?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}"</style>
${ model.stylesheet ? `
<style>
@import "${model.stylesheet}?umb__rnd=${Umbraco.Sys.ServerVariables.application.cacheBuster}"
</style>`
: ''
}
<div
style="display:contents;"
ng-class="{'show-validation': vm.blockEditorApi.internal.showValidation}"
ng-include="api.internal.sortMode ? api.internal.sortModeView : '${model.view}'"></div>
ng-include="api.internal.sortMode ? api.internal.sortModeView : '${model.view}'">
</div>
`;
$compile(shadowRoot)($scope);