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

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0--property-editor-guid-to-alias

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/LegacyUmbracoSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Expressions/AlterColumnExpression.cs
	src/Umbraco.Core/PropertyEditors/TinyMcePropertyEditorValueConverter.cs
	src/Umbraco.Core/XmlHelper.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
	src/Umbraco.Web/PropertyEditors/RteMacroRenderingPropertyEditorValueConverter.cs
	src/Umbraco.Web/Routing/DefaultUrlProvider.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
This commit is contained in:
Shannon
2013-09-17 00:27:17 +10:00
parent 86a5d16e25 bb641c937c
commit 371b1817ea
130 changed files with 2785 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/umbraco.controls/Panel.cs
View File

@@ -82,7 +82,8 @@ namespace umbraco.uicontrols
protected override void CreateChildControls()
{
CssClass = "umb-panel form-horizontal";
//fucking webforms controls and their rendering..
CssClass = "umb-panel form-horizontal umb-panel-nobody";
ID = base.ClientID + "_container";
header.TagName = "div";
@@ -94,14 +95,16 @@ namespace umbraco.uicontrols
header.Controls.Add(row);
leftcol.TagName = "span";
leftcol.Attributes.Add("class", "span4 umb-panel-header-meta");
leftcol.Attributes.Add("class", "span8");
title.TagName = "h1";
title.Attributes.Add("class", "headline");
leftcol.Controls.Add(title);
row.Controls.Add(leftcol);
rightcol.TagName = "span";
rightcol.Attributes.Add("class", "span8 umb-panel-header-meta");
rightcol.Attributes.Add("class", "span4");
rightcol.Controls.Add(Menu);
row.Controls.Add(rightcol);
@@ -113,7 +116,7 @@ namespace umbraco.uicontrols
Controls.AddAt(0,header);
base.CreateChildControls();
}