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

Merge branch 'dev-v7-login-retina-umbraco-logo' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-login-retina-umbraco-logo

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/pages/login.less
This commit is contained in:
Simon Busborg
2016-02-18 12:42:17 +01:00
parent dbb9386d22 cd3aaa47ca
commit 06c49daca7
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Web.UI.Client/src/less/pages/login.less
View File

@@ -9,13 +9,41 @@
color: @white;
position: absolute;
z-index: 10000;
top: 0px;
left: 0px;
margin: 0 !Important;
top: 0;
left: 0;
margin: 0 !important;
padding: 0;
border-radius: 0;
}
/* 1.5 dpr */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
only screen and (min-resolution: 144dpi)
{
.login-overlay {
background-image: url(../img/application/logo@2x.png) !important;
}
}
/* 2.0 dpr */
@media only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min-resolution: 192dpi)
{
.login-overlay {
background-image: url(../img/application/logo@2x.png) !important;
}
}
/* 3.0 dpr - For iPhone 6 Plus, Samsung Galaxy S5 and similar devices */
@media only screen and (-webkit-min-device-pixel-ratio: 3),
only screen and (min-resolution: 3dppx), /* default way */
only screen and (min-resolution: 350dpi) /* dppx fallback */
{
.login-overlay {
background-image: url(../img/application/logo@3x.png) !important;
}
}
.login-overlay .umb-modalcolumn {
background: none;
border: none;
@@ -62,7 +90,7 @@
}
#hrOr hr {
margin: 0px;
margin: 0;
border: none;
background-color: @gray;
height: 1px;
@@ -79,4 +107,4 @@
height: 20px;
margin: auto;
color: @grayLight;
}
}