From 45dde8717b68c7be6611096d3969fb657f4bab9a Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 12:55:32 +0200 Subject: [PATCH 1/7] Canvas designer Color editor issue --- src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html index 260f31c967..4ad4ba1345 100644 --- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html @@ -1,4 +1,5 @@  +
From 371e4382cb57cb2d5b8374588f39797c25d5163d Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 12:56:45 +0200 Subject: [PATCH 2/7] set a no disposable unique row ID for row styling --- .../views/propertyeditors/canvas/canvas.controller.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.controller.js index 08bd9097a8..30c4786fdb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.controller.js @@ -207,13 +207,18 @@ angular.module("umbraco") }; $scope.addRow = function (section, layout) { + //copy the selected layout into the rows collection var row = angular.copy(layout); + + // Init row value row = $scope.initRow(row); + // Push the new row if(row){ section.rows.push(row); } + }; $scope.removeRow = function (section, $index) { @@ -460,6 +465,10 @@ angular.module("umbraco") //set a disposable unique ID original.$uniqueId = $scope.setUniqueId(); + + //set a no disposable unique ID (util for row styling) + original.id = !row.id ? $scope.setUniqueId() : row.id; + return original; } From 50d3b81ed9788c163699545eb78c1bb064038c5f Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 12:57:33 +0200 Subject: [PATCH 3/7] Blank font style issue in canvas designer google font editor --- .../editors/googlefontpicker.less | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.less b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.less index c2cef7cd4f..5fb99d8c13 100644 --- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.less +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.less @@ -10,12 +10,25 @@ @fonttype-ALIAS-:''; /***end-lessParam--ALIAS-***/ -/***start-gridStyle--ALIAS-***/ --SCHEMA- { - font-family:@fontfamily-ALIAS-; +/***start-fontfamilystyle--ALIAS-***/ + +.fontfamily-ALIAS- () when not (@fontfamily-ALIAS- = '') { + font-family:@fontfamily-ALIAS-; +} + +.fontweight-ALIAS- () when not (@fontweight-ALIAS- = '') { font-weight:@fontweight-ALIAS-; +} + +.fontstyle-ALIAS- () when not (@fontstyle-ALIAS- = '') { font-style:@fontstyle-ALIAS-; } -/***end-gridStyle--ALIAS-***/ + +-SCHEMA- { + .fontfamily-ALIAS-; + .fontweight-ALIAS-; + .fontstyle-ALIAS-; +} +/***end-fontfamilystyle--ALIAS-***/ \ No newline at end of file From c3c755755d8809f8f5e40c94787e26fd6746c620 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 15:01:16 +0200 Subject: [PATCH 4/7] Canvas designer, palette config path in EnableCanvasDesigner fixed --- src/Umbraco.Web/UmbracoHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index d4b0517979..81b443a265 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -1344,7 +1344,7 @@ namespace Umbraco.Web if (UmbracoContext.Current.InPreviewMode) { canvasdesignerConfigPath = !string.IsNullOrEmpty(canvasdesignerConfigPath) ? canvasdesignerConfigPath : "/umbraco/js/canvasdesigner.config.js"; - canvasdesignerPalettesPath = !string.IsNullOrEmpty(canvasdesignerPalettesPath) ? canvasdesignerConfigPath : "/umbraco/js/canvasdesigner.palettes.js"; + canvasdesignerPalettesPath = !string.IsNullOrEmpty(canvasdesignerPalettesPath) ? canvasdesignerPalettesPath : "/umbraco/js/canvasdesigner.palettes.js"; if (!string.IsNullOrEmpty(cssPath)) result = string.Format(noPreviewLinks, cssPath) + Environment.NewLine; From 14e241bf21fbfb7b41adfcc1ea98982ea73b6c5b Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 18:26:57 +0200 Subject: [PATCH 5/7] Layout Editor editor without default box value --- .../src/canvasdesigner/editors/layout.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.less b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.less index 8512da21e2..7cc10da979 100644 --- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.less +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.less @@ -4,7 +4,7 @@ /************************************************************************/ /***start-lessParam--ALIAS-***/ -@layout-ALIAS-:box; +@layout-ALIAS-:''; /***end-lessParam--ALIAS-***/ /***start-lessStyle--ALIAS-***/ From 1231975a78363a9ea31767677b5e991f355b2a80 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 18:27:35 +0200 Subject: [PATCH 6/7] Bad path refer to grid instead of canvas --- .../src/views/propertyeditors/canvas/canvas.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.html index fec08844aa..a492b91ce0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.html @@ -125,7 +125,7 @@
-
+
@@ -193,7 +193,7 @@ -
+
From 2380217c21fe2df15e2c9e23e41916ff8623458d Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 1 Oct 2014 18:28:25 +0200 Subject: [PATCH 7/7] Very Basic shadow for the canvas designer --- .../src/canvasdesigner/editors/shadow.html | 8 +++++++ .../src/canvasdesigner/editors/shadow.js | 16 ++++++++++++++ .../src/canvasdesigner/editors/shadow.less | 21 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html create mode 100644 src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.js create mode 100644 src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.less diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html new file mode 100644 index 0000000000..f9f88401c4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html @@ -0,0 +1,8 @@ + +
+ +
+
+
+ +
\ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.js b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.js new file mode 100644 index 0000000000..fa082db741 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.js @@ -0,0 +1,16 @@ + +/*********************************************************************************************************/ +/* shadow editor */ +/*********************************************************************************************************/ + +angular.module("Umbraco.canvasdesigner") + +.controller("Umbraco.canvasdesigner.shadow", function ($scope) { + + if (!$scope.item.values) { + $scope.item.values = { + shadow: '' + } + } + +}) \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.less b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.less new file mode 100644 index 0000000000..e131911fb3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.less @@ -0,0 +1,21 @@ + +/************************************************************************/ +/* shadow -ALIAS- -CSS- */ +/************************************************************************/ + +/***start-lessParam--ALIAS-***/ +@shadow-ALIAS-:''; +/***end-lessParam--ALIAS-***/ + +/***start-lessStyle--ALIAS-***/ + +.valueshadow-ALIAS- () when (isnumber(@shadow-ALIAS-)) { + -webkit-box-shadow: 0 0 @shadow-ALIAS- + 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0 0 @shadow-ALIAS- + 0px rgba(0, 0, 0, 0.5); + box-shadow: 0 0 @shadow-ALIAS- + 0px rgba(0, 0, 0, 0.5); +} + +-SCHEMA- { + .valueshadow-ALIAS- +} +/***end-lessStyle--ALIAS-***/ \ No newline at end of file