IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux(): minor fix to login page

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-04 12:13:40 +01:00
parent 4b08f3909d
commit b673bc1386
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
public/app/partials/login.html
View File

@ -39,25 +39,27 @@
</div>
</form>
<div class="text-center login-divider" ng-if="oauthEnabled">
<div class="login-divider-line">
<span class="login-divider-text">
Or login with
</span>
<div ng-if="loginMode">
<div class="text-center login-divider" ng-if="oauthEnabled">
<div class="login-divider-line">
<span class="login-divider-text">
Or login with
</span>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="clearfix"></div>
<div class="login-oauth text-center" ng-if="oauthEnabled">
<a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="googleAuthEnabled">
<i class="fa fa-google"></i>
with Google
</a>
<a class="btn btn-large btn-github" href="login/github" target="_self" ng-if="githubAuthEnabled">
<i class="fa fa-github"></i>
with Github
</a>
<div class="login-oauth text-center" ng-if="oauthEnabled">
<a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="googleAuthEnabled">
<i class="fa fa-google"></i>
with Google
</a>
<a class="btn btn-large btn-github" href="login/github" target="_self" ng-if="githubAuthEnabled">
<i class="fa fa-github"></i>
with Github
</a>
</div>
</div>
<div class="clearfix"></div>

5
public/app/plugins/datasource/graphite/datasource.ts
View File

@ -64,7 +64,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
this.annotationQuery = function(options) {
// Graphite metric as annotation
if (options.annotation.target) {
var target = templateSrv.replace(options.annotation.target);
var target = templateSrv.replace(options.annotation.target, {}, 'glob');
var graphiteQuery = {
rangeRaw: options.rangeRaw,
targets: [{ target: target }],
@ -72,8 +72,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
maxDataPoints: 100
};
return this.query(graphiteQuery)
.then(function(result) {
return this.query(graphiteQuery).then(function(result) {
var list = [];
for (var i = 0; i < result.data.length; i++) {

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

@ -55,6 +55,10 @@
color: $white;
}
&:focus {
outline: 0;
}
font-weight: bold;
display: inline-block;
width: 170px;
@ -178,7 +182,7 @@
}
@include media-breakpoint-up(md) {
.login-box-logo {
.login-box-logo {
img {
width: 125px;
}