Merge branch 'dev-v7' into 7.3.0

Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Web.UI.Client/src/less/login.less
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
This commit is contained in:
Stephan
2015-05-18 16:23:12 +02:00
8 changed files with 155 additions and 104 deletions

View File

@@ -22,9 +22,10 @@
}
.login-overlay .form {
position:fixed;
display: block;
padding-top: 100px;
padding-left: 165px;
top: 100px;
left: 165px;
width: 370px;
text-align: right;
}
@@ -45,6 +46,13 @@
text-align: center;
}
@media (max-width: 565px) {
// Remove padding on login-form on smaller devices
.login-overlay .form {
left: inherit;
right:25px;
}
#hrOr {
height: 30px;
text-align: center;