diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less
index e29b0e22af..e74c0ddc20 100644
--- a/src/Umbraco.Web.UI.Client/src/less/forms.less
+++ b/src/Umbraco.Web.UI.Client/src/less/forms.less
@@ -26,10 +26,6 @@ label.control-label {
-//standard editor width
-.umb-editor{width: 460px;}
-
-
//utill styll to hide child untill hover
.hover-show{visibility: hidden;}
*:hover > .hover-show{visibility: visible;}
diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index ca00e90d1d..91f1d0c25c 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -158,6 +158,10 @@ div.umb-codeeditor .umb-btn-toolbar {
margin-bottom: 25px !important;
}
+.umb-pane > .umb-control-group:last-child {
+ border: none;
+}
+
.umb-control-group .umb-el-wrap {
padding: 0
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index 939887fa61..36326b054e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -62,8 +62,13 @@
padding: 15px 20px 10px 20px;
margin-top: 30px;
clear: both;
- border-top: #efefef 1px solid
+ border-top: #efefef 1px solid;
}
+.umb-dialog .umb-btn-toolbar .umb-control-group{
+ border: none;
+ padding: none;
+}
+
.umb-dialog-body{
overflow:auto;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 5319da9681..f06fd5585b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -9,6 +9,10 @@
width: 95%;
}
+.umb-codeeditor{
+ width: 99%;
+}
+
//
// Color picker
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 3c067ea1d3..8f6936c9bb 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -694,9 +694,6 @@
-
-
-
@@ -1593,16 +1590,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1717,25 +1704,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2161,7 +2130,6 @@
Web.Template.config
Designer
-
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 4f81de58e5..bb2c1d04a0 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1021,26 +1021,6 @@
-
- ChangePassword.ascx
- ASPXCodeBehind
-
-
- ChangePassword.ascx
-
-
- DesktopMediaUploader.ascx
- ASPXCodeBehind
-
-
- DesktopMediaUploader.ascx
-
-
- DeveloperDashboardIntro.ascx
-
-
- DeveloperDashboardVideos.ascx
-
FeedProxy.aspx
ASPXCodeBehind
@@ -1048,33 +1028,6 @@
FeedProxy.aspx
-
- MediaDashboardIntro.ascx
-
-
- MediaDashboardVideos.ascx
-
-
- MembersDashboardIntro.ascx
-
-
- MembersDashboardVideos.ascx
-
-
- SettingsDashboardIntro.ascx
-
-
- SettingsDashboardVideos.ascx
-
-
- StartupDashboardIntro.ascx
-
-
- StartupDashboardKits.ascx
-
-
- StartupDashboardVideos.ascx
-
EditRelationType.aspx
ASPXCodeBehind
@@ -1831,28 +1784,7 @@
-
- ASPXCodeBehind
-
-
-
-
-
- ASPXCodeBehind
-
-
-
- ASPXCodeBehind
-
-
- ASPXCodeBehind
-
-
-
-
-
-
ASPXCodeBehind
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
deleted file mode 100644
index d09ba25764..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.Security;
-using Umbraco.Core.Configuration;
-using umbraco.BusinessLogic;
-
-namespace umbraco.presentation.umbraco.dashboard
-{
- public partial class ChangePassword : System.Web.UI.UserControl
- {
- protected void Page_Load(object sender, EventArgs e)
- {
-
- }
-
- protected void changePassword_Click(object sender, EventArgs e)
- {
- User u = User.GetCurrent();
- MembershipProvider provider = Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider];
- MembershipUser user = provider.GetUser(u.LoginName, true);
-
-
- string newPass = password.Text;
- string oldPass = currentpassword.Text;
- if (!string.IsNullOrEmpty(oldPass) && provider.ValidateUser(u.LoginName, oldPass))
- {
- if (!string.IsNullOrEmpty(newPass.Trim()))
- {
- if (newPass == confirmpassword.Text)
- {
- // make sure password is not empty
- user.ChangePassword(u.Password, newPass);
- changeForm.Visible = false;
- errorPane.Visible = false;
- passwordChanged.Visible = true;
- }
- else
- {
- errorPane.Visible = true;
- errorMessage.Text = ui.Text("passwordIsDifferent");
- }
- }
- else
- {
- errorPane.Visible = true;
- errorMessage.Text = ui.Text("passwordIsBlank");
- }
- }
- else
- {
- errorPane.Visible = true;
- errorMessage.Text = ui.Text("passwordInvalid");
- }
-
- }
- }
-}
\ No newline at end of file