diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index 3ec502cca1..76db356538 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -257,6 +257,6 @@ angular.module("umbraco") // ********************************************* //assetsService.loadCss("/App_Plugins/Lecoati.uSky.Grid/lib/jquery-ui-1.10.4.custom/css/ui-lightness/jquery-ui-1.10.4.custom.min.css"); - assetsService.loadCss($scope.model.config.items.approvedBackgroundCss); + //assetsService.loadCss($scope.model.config.items.approvedBackgroundCss); }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js index f8ef859f95..49b6c74556 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js @@ -25,7 +25,7 @@ angular.module("umbraco") enableMacro: true, enabledEditors: [ "rte", "media", "macro" ], enableMultiCells: true, - approvedBackgroundCss: "views/propertyeditors/grid/config/grid.default.backgrounds.css", + approvedBackgroundCss: "", gridConfigPath: "views/propertyeditors/grid/config/grid.default.config.js" } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html index 5525a477c9..f3e656d89e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html @@ -10,7 +10,7 @@ -
Allowed row settings:
+ -Allowed editors:
+Others settings:
|
Multiple controls in cell -Approved background stylesheet path: + |