Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
0f52b439
Commit
0f52b439
authored
Feb 08, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(login): minor ux improvements
make buttons bigger and introduce the login divider. closes #3698
parent
2f3d1ec2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
14 deletions
+55
-14
public/app/partials/login.html
+20
-8
public/less/login.less
+35
-6
No files found.
public/app/partials/login.html
View file @
0f52b439
...
...
@@ -65,26 +65,38 @@
<div
class=
"clearfix"
></div>
<div
class=
"text-center login-divider"
>
<div
class=
"login-divider-line"
>
<span
class=
"login-divider-text"
>
Or login with
</span>
</div>
</div>
<div
class=
"clearfix"
></div>
<div
class=
"login-oauth text-center"
>
<a
class=
"btn btn-google"
href=
"login/google"
target=
"_self"
ng-if=
"googleAuthEnabled"
>
<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-github"
href=
"login/github"
target=
"_self"
ng-if=
"githubAuthEnabled"
>
<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=
"row"
style=
"margin-top: 40px"
>
<div
class=
"text-center"
>
<a
href=
"user/password/send-reset-email"
>
Forgot your password?
</a>
<div
class=
"text-center password-recovery"
>
<div
class=
"text-center"
>
<a
href=
"user/password/send-reset-email"
>
Forgot your password?
</a>
</div>
</div>
</div>
<div
class=
"row"
style=
"margin-top: 50px"
>
<div
class=
"version-footer text-center small"
>
Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}},
...
...
public/less/login.less
View file @
0f52b439
...
...
@@ -76,21 +76,23 @@
.login-submit-button-row {
text-align: center;
margin-top:
4
0px;
margin-top:
3
0px;
button {
padding:
9px 7
px;
font-size: 1
4
px;
padding:
14px 23
px;
font-size: 1
6
px;
font-weight: bold;
min-width: 150px;
display: inline-block;
border: 1px solid lighten(@btnInverseBackground, 10%);
color: @grayLight;
}
}
.login-oauth {
margin-top: 30px;
padding: 10px;
background: @grafanaTargetBackground;
.btn {
margin: 5px;
}
.btn-google {
background: #dd4b39;
color: white;
...
...
@@ -101,6 +103,33 @@
}
}
.password-recovery {
background: @grafanaTargetBackground;
margin-top: 30px;
padding: 10px;
a {
color: @grayLight;
}
}
.login-divider {
float: left;
width: 50%;
margin: 5px 25% 25px 25%;
.login-divider-line {
width: 100%;
height: 10px;
border-bottom: 1px solid @gray;
.login-divider-text {
background-color: @grayDarker;
color: @grayLight;
padding: 0 10px;
}
}
}
.signup-page-background {
position: fixed;
top: 0;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment