Skip to content

Commit 086ef7a

Browse files
idseefeldidseefeld
authored
Merge pull request #30 from idseefeld/bugs/27-customviews-depend-on-property-position
fix issue 27
2 parents 0be8ca8 + 4eca1ed commit 086ef7a

File tree

12 files changed

+502
-51
lines changed

12 files changed

+502
-51
lines changed

‎src/wysiwgUmbracoCommunityExtensions.TestSite/Views/layout.cshtml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
var pageTitle = string.IsNullOrEmpty(Model.MetaTitle) ? Model.Name : Model.MetaTitle;
1111
var root = Model.AncestorsOrSelf<RootPage>()?.FirstOrDefault();
1212
string siteName = root?.SiteName ?? authority ?? "?";
13+
14+
string pageBackgroundColor = "inherit";
15+
if (Model is IPageSettings pageSettings)
16+
{
17+
pageBackgroundColor = pageSettings.PageBackgroundColor ?? pageBackgroundColor;
18+
}
1319
}
1420
<!DOCTYPE html>
1521
<html>
@@ -24,6 +30,12 @@
2430

2531
<link href="~/styles/customblockgrid.min.css?v=@v" rel="stylesheet" />
2632
<link href="~/styles/customer.min.css?v=@v" rel="stylesheet" />
33+
34+
<style>
35+
#canvas {
36+
background: @pageBackgroundColor;
37+
}
38+
</style>
2739
</head>
2840
<body id="top" class="uui-font">
2941

‎src/wysiwgUmbracoCommunityExtensions.TestSite/Views/standardPage.cshtml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
@using Umbraco.Cms.Web.Common.PublishedModels;
1+
@using Umbraco.Cms.Web.Common.PublishedModels;
22
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<StandardPage>
33
@{
4-
Layout = "layout.cshtml";
4+
Layout = "layout.cshtml";
55
}
66

77
@await Html.GetBlockGridHtmlAsync(Model.Main)
88

9-
<div style="max-width: 300px; background-color: #cef; padding: 10px">
10-
@await Html.GetBlockListHtmlAsync(Model.BlockList)
11-
</div>
9+
@await Html.GetBlockGridHtmlAsync(Model.SecondGrid)

‎src/wysiwgUmbracoCommunityExtensions.TestSite/uSync/v15/Content/home_pqnnwmzt.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
{
317317
"key": "04b8ea0f-5399-44dc-a0dc-430a59b4b84d",
318318
"mediaKey": "055545db-11c9-4f5d-86b8-90ca79ef37ce",
319-
"mediaTypeAlias": "",
319+
"mediaTypeAlias": "Image",
320320
"crops": [],
321321
"focalPoint": null
322322
}
@@ -366,8 +366,8 @@
366366
"editorAlias": null,
367367
"segment": null,
368368
"value": {
369-
"label": "Yellow",
370-
"value": "#fee648"
369+
"label": "Transparent",
370+
"value": "#fff"
371371
}
372372
},
373373
{

0 commit comments

Comments
 (0)