ux(): minor fix to login page

public/app/partials/login.html

@@ -39,6 +39,7 @@
 				</div>
 			</form>
 
+			<div ng-if="loginMode">
 				<div class="text-center login-divider" ng-if="oauthEnabled">
 					<div class="login-divider-line">
 						<span class="login-divider-text">
@@ -59,6 +60,7 @@
 						with Github
 					</a>
 				</div>
+			</div>
 
 			<div class="clearfix"></div>
 

public/app/plugins/datasource/graphite/datasource.ts

@@ -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++) {

public/sass/pages/_login.scss

@@ -55,6 +55,10 @@
     color: $white;
   }
 
+  &:focus {
+    outline: 0;
+  }
+
   font-weight: bold;
   display: inline-block;
   width: 170px;