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
2bb87446
Unverified
Commit
2bb87446
authored
Aug 17, 2018
by
Marcus Efraimsson
Committed by
GitHub
Aug 17, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12955 from grafana/12951-login-buttons
Login button issue in light theme
parents
e3b585d8
19043229
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
public/app/partials/login.html
+2
-2
public/sass/_variables.scss
+2
-2
public/sass/pages/_login.scss
+9
-0
No files found.
public/app/partials/login.html
View file @
2bb87446
...
@@ -55,12 +55,12 @@
...
@@ -55,12 +55,12 @@
<i
class=
"btn-service-icon fa fa-gitlab"
></i>
<i
class=
"btn-service-icon fa fa-gitlab"
></i>
Sign in with GitLab
Sign in with GitLab
</a>
</a>
<a
class=
"btn btn-medium btn-
inverse btn-
service btn-service--grafanacom login-btn"
href=
"login/grafana_com"
target=
"_self"
<a
class=
"btn btn-medium btn-service btn-service--grafanacom login-btn"
href=
"login/grafana_com"
target=
"_self"
ng-if=
"oauth.grafana_com"
>
ng-if=
"oauth.grafana_com"
>
<i
class=
"btn-service-icon"
></i>
<i
class=
"btn-service-icon"
></i>
Sign in with Grafana.com
Sign in with Grafana.com
</a>
</a>
<a
class=
"btn btn-medium btn-
inverse btn-
service btn-service--oauth login-btn"
href=
"login/generic_oauth"
target=
"_self"
<a
class=
"btn btn-medium btn-service btn-service--oauth login-btn"
href=
"login/generic_oauth"
target=
"_self"
ng-if=
"oauth.generic_oauth"
>
ng-if=
"oauth.generic_oauth"
>
<i
class=
"btn-service-icon fa fa-sign-in"
></i>
<i
class=
"btn-service-icon fa fa-sign-in"
></i>
Sign in with {{oauth.generic_oauth.name}}
Sign in with {{oauth.generic_oauth.name}}
...
...
public/sass/_variables.scss
View file @
2bb87446
...
@@ -197,7 +197,7 @@ $external-services: (
...
@@ -197,7 +197,7 @@ $external-services: (
github
:
(
bgColor
:
#464646
,
borderColor
:
#393939
,
icon
:
''
)
,
github
:
(
bgColor
:
#464646
,
borderColor
:
#393939
,
icon
:
''
)
,
gitlab
:
(
bgColor
:
#fc6d26
,
borderColor
:
#e24329
,
icon
:
''
)
,
gitlab
:
(
bgColor
:
#fc6d26
,
borderColor
:
#e24329
,
icon
:
''
)
,
google
:
(
bgColor
:
#e84d3c
,
borderColor
:
#b83e31
,
icon
:
''
)
,
google
:
(
bgColor
:
#e84d3c
,
borderColor
:
#b83e31
,
icon
:
''
)
,
grafanacom
:
(
bgColor
:
inherit
,
borderColor
:
#393939
,
icon
:
''
)
,
grafanacom
:
(
bgColor
:
#262628
,
borderColor
:
#393939
,
icon
:
''
)
,
oauth
:
(
bgColor
:
inherit
,
borderColor
:
#393939
,
icon
:
''
)
oauth
:
(
bgColor
:
#262628
,
borderColor
:
#393939
,
icon
:
''
)
)
)
!
default
;
!
default
;
public/sass/pages/_login.scss
View file @
2bb87446
...
@@ -76,6 +76,15 @@ select:-webkit-autofill:focus {
...
@@ -76,6 +76,15 @@ select:-webkit-autofill:focus {
margin-left
:
1rem
;
margin-left
:
1rem
;
}
}
}
}
&
.btn-inverse
{
color
:
#e3e3e3
;
text-shadow
:
0px
1px
0
rgba
(
0
,
0
,
0
,
0
.1
);
background-color
:
#2a2a2c
;
background-image
:
linear-gradient
(
to
bottom
,
#262628
,
#303032
);
background-repeat
:
repeat-x
;
border-color
:
#262628
;
box-shadow
:
-1px
-1px
0
0
rgba
(
255
,
255
,
255
,
0
.1
)
,
1px
1px
0
0
rgba
(
0
,
0
,
0
,
0
.3
);
}
}
}
.login-button-forgot-password
{
.login-button-forgot-password
{
...
...
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