Commit Graph

5 Commits

Author SHA1 Message Date
Shannon
c760a7c50d Merge branch 'dev-v7-7.3.0-UmbHelperInterfaces' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-7.3.0-UmbHelperInterfaces
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2015-02-18 17:14:55 +01:00
antoine
1e1b8b7ae6 Delete canvas designer style fixed 2014-09-30 21:41:13 +02:00
antoine
6d1ccaa7a4 Renames Tuning to canvasdesigner (code and comments) 2014-09-23 19:10:51 +02:00
antoine
3aedb69490 New design for the tuning, all panel at the left sight
Conflicts:
	src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.front.js
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
2014-09-23 17:57:41 +02:00
per ploug
0f32283601 Renames Grid to canvas 2014-09-23 16:30:27 +02:00