IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-21 22:13:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12412 from grafana/12393_login

Browse Source 
login: fix layout issues
This commit is contained in:
Marcus Efraimsson 2018-06-26 18:01:54 +02:00 committed by GitHub
commit 06daae2179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/sass/components/_footer.scss
View File

@ -25,7 +25,7 @@
display: inline-block;
padding-right: 2px;
&::after {
content: " | ";
content: ' | ';
padding-left: 2px;
}
}
@ -33,14 +33,21 @@
li:last-child {
&::after {
padding-left: 0;
content: "";
content: '';
}
}
}
.login-page {
.footer {
position: absolute;
bottom: $spacer;
padding: 1rem 0 1rem 0;
}
}
@include media-breakpoint-up(md) {
.footer {
bottom: $spacer;
position: absolute;
padding: 5rem 0 1rem 0;
}
}

29
public/sass/pages/_login.scss
View File

@ -1,9 +1,8 @@
$login-border: #8daac5;
.login {
background-position: center;
min-height: 85vh;
height: 80vh;
background-position: center;
background-repeat: no-repeat;
min-width: 100%;
margin-left: 0;
@ -95,7 +94,7 @@ select:-webkit-autofill:focus {
position: relative;
justify-content: center;
z-index: 1;
height: 320px;
min-height: 320px;
}
.login-branding {
@ -106,6 +105,7 @@ select:-webkit-autofill:focus {
align-items: center;
justify-content: center;
flex-grow: 0;
padding-top: 2rem;
.logo-icon {
width: 70px;
@ -127,7 +127,7 @@ select:-webkit-autofill:focus {
.login-inner-box {
text-align: center;
padding: 2rem 4rem;
padding: 2rem;
display: flex;
flex-direction: column;
align-items: center;
@ -243,7 +243,7 @@ select:-webkit-autofill:focus {
justify-content: space-between;
.login-divider-line {
width: 110px;
width: 100px;
height: 10px;
border-bottom: 1px solid $login-border;
@ -323,7 +323,10 @@ select:-webkit-autofill:focus {
width: 35%;
padding: 4rem 2rem;
border-right: 1px solid $login-border;
justify-content: flex-start;
.logo-icon {
width: 80px;
}
}
.login-inner-box {
@ -331,14 +334,18 @@ select:-webkit-autofill:focus {
padding: 1rem 2rem;
}
.login-branding {
.logo-icon {
width: 80px;
.login-divider {
.login-divider-line {
width: 110px;
}
}
}
@include media-breakpoint-up(md) {
.login {
min-height: 100vh;
}
.login-content {
flex: 1 0 100%;
}
@ -373,10 +380,6 @@ select:-webkit-autofill:focus {
}
@include media-breakpoint-up(lg) {
.login {
min-height: 100vh;
}
.login-form-input {
min-width: 300px;
}