fix(login): hide divider if no oath

closes #3980
pull/3991/head
bergquist 9 years ago
parent 509b37eb91
commit b469904c7f
  1. 3
      public/app/core/controllers/login_ctrl.js
  2. 8
      public/app/partials/login.html
  3. 4
      public/less/login.less

@ -17,6 +17,7 @@ function (angular, coreModule, config) {
$scope.googleAuthEnabled = config.googleAuthEnabled;
$scope.githubAuthEnabled = config.githubAuthEnabled;
$scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled;
$scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint;
@ -84,7 +85,5 @@ function (angular, coreModule, config) {
};
$scope.init();
});
});

@ -63,9 +63,7 @@
</div>
</form>
<div class="clearfix"></div>
<div class="text-center login-divider">
<div class="text-center login-divider" ng-if="oauthEnabled">
<div class="login-divider-line">
<span class="login-divider-text">
Or login with
@ -75,7 +73,7 @@
<div class="clearfix"></div>
<div class="login-oauth text-center">
<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
@ -86,6 +84,8 @@
</a>
</div>
<div class="clearfix"></div>
<div class="text-center password-recovery">
<div class="text-center">
<a href="user/password/send-reset-email">

@ -88,6 +88,8 @@
}
.login-oauth {
margin-bottom: 15px;
.btn {
margin: 5px;
}
@ -104,7 +106,7 @@
.password-recovery {
background: @grafanaTargetBackground;
margin-top: 30px;
margin-top: 10px;
padding: 10px;
a {
color: @grayLight;

Loading…
Cancel
Save