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
741e1bb7
Unverified
Commit
741e1bb7
authored
Jan 22, 2020
by
Torkel Ödegaard
Committed by
GitHub
Jan 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Login: Better auto sizing of login logo (#21645)
parent
5dddc91b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
16 deletions
+12
-16
public/app/core/components/Branding/Branding.tsx
+5
-1
public/app/core/components/Login/LoginPage.tsx
+1
-1
public/app/features/admin/LicenseChrome.tsx
+0
-1
public/sass/pages/_login.scss
+6
-13
No files found.
public/app/core/components/Branding/Branding.tsx
View file @
741e1bb7
...
@@ -7,9 +7,13 @@ export interface BrandComponentProps {
...
@@ -7,9 +7,13 @@ export interface BrandComponentProps {
}
}
export
const
LoginLogo
:
FC
<
BrandComponentProps
>
=
({
className
})
=>
{
export
const
LoginLogo
:
FC
<
BrandComponentProps
>
=
({
className
})
=>
{
const
maxSize
=
css
`
max-width: 150px;
`
;
return
(
return
(
<>
<>
<
img
className=
{
c
lassName
}
src=
"public/img/grafana_icon.svg"
alt=
"Grafana"
/>
<
img
className=
{
c
x
(
className
,
maxSize
)
}
src=
"public/img/grafana_icon.svg"
alt=
"Grafana"
/>
<
div
className=
"logo-wordmark"
/>
<
div
className=
"logo-wordmark"
/>
</>
</>
);
);
...
...
public/app/core/components/Login/LoginPage.tsx
View file @
741e1bb7
...
@@ -15,7 +15,7 @@ export const LoginPage: FC = () => {
...
@@ -15,7 +15,7 @@ export const LoginPage: FC = () => {
<
Branding
.
LoginBackground
className=
"login container"
>
<
Branding
.
LoginBackground
className=
"login container"
>
<
div
className=
"login-content"
>
<
div
className=
"login-content"
>
<
div
className=
"login-branding"
>
<
div
className=
"login-branding"
>
<
Branding
.
LoginLogo
className=
"log
o-icon
"
/>
<
Branding
.
LoginLogo
className=
"log
in-logo
"
/>
</
div
>
</
div
>
<
LoginCtrl
>
<
LoginCtrl
>
{
({
{
({
...
...
public/app/features/admin/LicenseChrome.tsx
View file @
741e1bb7
...
@@ -57,7 +57,6 @@ export const LicenseChrome: React.FC<Props> = ({ header, editionNotice, subheade
...
@@ -57,7 +57,6 @@ export const LicenseChrome: React.FC<Props> = ({ header, editionNotice, subheade
}
}
}
}
>
>
<
img
<
img
className=
"logo-icon"
src=
"/public/img/grafana_icon.svg"
src=
"/public/img/grafana_icon.svg"
alt=
"Grafana"
alt=
"Grafana"
width=
"80px"
width=
"80px"
...
...
public/sass/pages/_login.scss
View file @
741e1bb7
...
@@ -115,12 +115,13 @@ select:-webkit-autofill:focus {
...
@@ -115,12 +115,13 @@ select:-webkit-autofill:focus {
align-items
:
center
;
align-items
:
center
;
justify-content
:
center
;
justify-content
:
center
;
flex-grow
:
0
;
flex-grow
:
0
;
padding-top
:
$space-xl
;
padding
:
$space-xl
;
}
.logo-icon
{
.login-logo
{
width
:
70px
;
width
:
100%
;
margin-bottom
:
15
px
;
max-width
:
250
px
;
}
margin-bottom
:
15px
;
}
}
.app-grafana
{
.app-grafana
{
...
@@ -285,10 +286,6 @@ select:-webkit-autofill:focus {
...
@@ -285,10 +286,6 @@ select:-webkit-autofill:focus {
@include
media-breakpoint-up
(
sm
)
{
@include
media-breakpoint-up
(
sm
)
{
.login-branding
{
.login-branding
{
padding
:
$space-md
;
padding
:
$space-md
;
.logo-icon
{
width
:
80px
;
}
}
}
}
}
...
@@ -309,10 +306,6 @@ select:-webkit-autofill:focus {
...
@@ -309,10 +306,6 @@ select:-webkit-autofill:focus {
padding
:
$space-xl
;
padding
:
$space-xl
;
flex-grow
:
1
;
flex-grow
:
1
;
border-right
:
1px
solid
$login-border
;
border-right
:
1px
solid
$login-border
;
.logo-icon
{
width
:
130px
;
}
}
}
.login-button-group
{
.login-button-group
{
...
...
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