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

Fixes merge issues. Fixes Fixes for cmsContentXml table since the Content type heirarchy tables are different in v6.

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-25 19:26:06 -10:00
parent d65bee76b2
commit 7fc4822bbe
6 changed files with 138 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI/umbraco/login.aspx
View File

@@ -21,7 +21,7 @@
}
body
{
font-size: 11px;
font-size: 11px;
width: 100%;
font-family: Trebuchet MS, verdana, arial, Lucida Grande;
text-align: center;
@@ -70,7 +70,7 @@
<asp:Label ID="username" runat="server" AssociatedControlID="lname"></asp:Label>
</td>
<td>
<asp:TextBox AutoCompleteType="None" autocomplete="off" ID="lname" Style="padding-left: 3px; background: url(images/gradientBackground.png);
<asp:TextBox ID="lname" Style="padding-left: 3px; background: url(images/gradientBackground.png);
_background: none; border-right: #999999 1px solid; border-top: #999999 1px solid;
border-left: #999999 1px solid; border-bottom: #999999 1px solid; width: 180px;"
runat="server"></asp:TextBox>
@@ -85,7 +85,7 @@
<asp:Label ID="password" runat="server" AssociatedControlID="passw"></asp:Label>
</td>
<td>
<asp:TextBox AutoCompleteType="None" autocomplete="off" ID="passw" Style="padding-left: 3px; background: url(images/gradientBackground.png);
<asp:TextBox ID="passw" Style="padding-left: 3px; background: url(images/gradientBackground.png);
_background: none; border-right: #999999 1px solid; border-top: #999999 1px solid;
border-left: #999999 1px solid; border-bottom: #999999 1px solid; width: 180px;"
runat="server" TextMode="Password"></asp:TextBox>