Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-08-26 09:49:01 +02:00
parent f4c542795c 443a30742a
commit 9c7b92d3f5
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/_admin/aardvark/APP/frontend/js/templates/loginView.ejs
View File

@ -1,6 +1,8 @@
<script id="loginView.ejs" type="text/template"> <script id="loginView.ejs" type="text/template">
<div class="loginFixedWindow"> <div class="loginFixedWindow">
<img id="loginLogo" src="img/logo_arangodb_transp.png"/>
<div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/logo_arangodb_transp.png"></a></div></div>
<div id="loginWindow" class="login-window"> <div id="loginWindow" class="login-window">
<p class="wrong-credentials" style="display:none" >Wrong credentials!</p> <p class="wrong-credentials" style="display:none" >Wrong credentials!</p>
<form id="loginForm"> <form id="loginForm">

13
js/apps/system/_admin/aardvark/APP/frontend/scss/_login.scss
View File

@ -7,11 +7,18 @@
width: 100%; width: 100%;
z-index: 9999; z-index: 9999;
img { .resizecontainer {
height: 40px; position: relative;
margin: 10px; top: 0;
img {
height: 33px;
margin-left: -6px;
margin-top: 9px;
}
} }
} }
.login-window { .login-window {