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

grafana_com: changed name of oauth grafana_net integration (old settings names still work), and updated login button look, closes #8415

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-05-22 14:56:50 +02:00
parent 7c50563f0f
commit c34db77f04
9 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,10 +40,10 @@
</form>
<div ng-if="loginMode">
<div class="text-center login-divider" ng-show="oauthEnabled && !disableLoginForm">
<div class="text-center login-divider">
<div class="login-divider-line">
<span class="login-divider-text">
Or login with
<span ng-show="oauthEnabled && !disableLoginForm">Or</span> Login With
</span>
</div>
</div>
@@ -53,32 +53,33 @@
<div class="login-oauth text-center" ng-show="oauthEnabled">
<a class="btn btn-large btn-google" href="login/google" target="_self" ng-if="oauth.google">
<i class="fa fa-google"></i>
with Google
Google
</a>
<a class="btn btn-large btn-github" href="login/github" target="_self" ng-if="oauth.github">
<i class="fa fa-github"></i>
with GitHub
GitHub
</a>
<a class="btn btn-large btn-grafana-net" href="login/grafananet" target="_self" ng-if="oauth.grafananet">
with <span>Grafana.com</span>
<a class="btn btn-large btn-grafana-com" href="login/grafana_com" target="_self" ng-if="oauth.grafana_com">
<img src="public/img/grafana_icon.svg"></img>
<span>Grafana.com</span>
</a>
<a class="btn btn-large btn-generic-oauth" href="login/generic_oauth" target="_self" ng-if="oauth.generic_oauth">
<i class="fa fa-gear"></i>
with {{oauth.generic_oauth.name}}
</a>
</div>
</div>
<div class="clearfix"></div>
<div class="text-center password-recovery" ng-hide="disableLoginForm">
<div class="text-center">
<a href="user/password/send-reset-email">
Forgot your password?
{{oauth.generic_oauth.name}}
</a>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="text-center password-recovery" ng-hide="disableLoginForm">
<div class="text-center">
<a href="user/password/send-reset-email">
Forgot your password?
</a>
</div>
</div>
</div>
</div>

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

@@ -36,6 +36,7 @@
.login-inner-box {
background: $panel-bg;
text-align: center;
padding-bottom: 3rem;
}
.login-tab-header {
@@ -97,7 +98,6 @@
}
.login-oauth {
margin-bottom: 15px;
.btn {
margin: 5px;
@@ -113,23 +113,18 @@
color: white;
}
.btn-grafana-net {
background: url(../img/grafana_net_logo.svg);
background-size: 10rem;
background-repeat: no-repeat;
background-position: right 35%;
overflow: hidden;
padding-right: 10.5rem;
.btn-grafana-com {
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color);
box-shadow: $card-shadow;
span {
display: none;
img {
width: 19px;
}
}
}
.password-recovery {
background: $tight-form-bg;
margin-top: 10px;
padding: 10px;
a {
color: $gray-2;