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
df60dbd7
Unverified
Commit
df60dbd7
authored
Apr 21, 2020
by
Ivana Huckova
Committed by
GitHub
Apr 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
@grafana/ui: Fix login icon (#23732)
* Fix sign in button * Fix modal button in button
parent
1b8d669a
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
10 deletions
+8
-10
packages/grafana-ui/src/types/icon.ts
+2
-0
public/app/core/components/sidemenu/SignIn.tsx
+1
-1
public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap
+2
-1
public/app/features/api-keys/ApiKeysPage.tsx
+1
-3
public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
+2
-5
No files found.
packages/grafana-ui/src/types/icon.ts
View file @
df60dbd7
...
@@ -52,6 +52,7 @@ export type IconName =
...
@@ -52,6 +52,7 @@ export type IconName =
|
'circle'
|
'circle'
|
'arrow-up'
|
'arrow-up'
|
'arrow-from-right'
|
'arrow-from-right'
|
'arrow-from-left'
|
'keyboard'
|
'keyboard'
|
'search'
|
'search'
|
'chart-line'
|
'chart-line'
...
@@ -162,6 +163,7 @@ export const getAvailableIcons = (): IconName[] => [
...
@@ -162,6 +163,7 @@ export const getAvailableIcons = (): IconName[] => [
'circle'
,
'circle'
,
'arrow-up'
,
'arrow-up'
,
'arrow-from-right'
,
'arrow-from-right'
,
'arrow-from-left'
,
'keyboard'
,
'keyboard'
,
'search'
,
'search'
,
'chart-line'
,
'chart-line'
,
...
...
public/app/core/components/sidemenu/SignIn.tsx
View file @
df60dbd7
...
@@ -9,7 +9,7 @@ export const SignIn: FC<any> = ({ url }) => {
...
@@ -9,7 +9,7 @@ export const SignIn: FC<any> = ({ url }) => {
<
div
className=
"sidemenu-item"
>
<
div
className=
"sidemenu-item"
>
<
a
href=
{
loginUrl
}
className=
"sidemenu-link"
target=
"_self"
>
<
a
href=
{
loginUrl
}
className=
"sidemenu-link"
target=
"_self"
>
<
span
className=
"icon-circle sidemenu-icon"
>
<
span
className=
"icon-circle sidemenu-icon"
>
<
Icon
name=
"
sign-in-alt
"
/>
<
Icon
name=
"
arrow-from-left"
size=
"xl
"
/>
</
span
>
</
span
>
</
a
>
</
a
>
<
a
href=
{
loginUrl
}
target=
"_self"
>
<
a
href=
{
loginUrl
}
target=
"_self"
>
...
...
public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap
View file @
df60dbd7
...
@@ -13,7 +13,8 @@ exports[`Render should render component 1`] = `
...
@@ -13,7 +13,8 @@ exports[`Render should render component 1`] = `
className="icon-circle sidemenu-icon"
className="icon-circle sidemenu-icon"
>
>
<Icon
<Icon
name="sign-in-alt"
name="arrow-from-left"
size="xl"
/>
/>
</span>
</span>
</a>
</a>
...
...
public/app/features/api-keys/ApiKeysPage.tsx
View file @
df60dbd7
...
@@ -180,9 +180,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
...
@@ -180,9 +180,7 @@ export class ApiKeysPage extends PureComponent<Props, any> {
return
(
return
(
<
SlideDown
in=
{
isAdding
}
>
<
SlideDown
in=
{
isAdding
}
>
<
div
className=
"cta-form"
>
<
div
className=
"cta-form"
>
<
button
className=
"cta-form__close btn btn-transparent"
onClick=
{
this
.
onToggleAdding
}
>
<
IconButton
name=
"times"
className=
"cta-form__close btn btn-transparent"
onClick=
{
this
.
onToggleAdding
}
/>
<
IconButton
name=
"times"
/>
</
button
>
<
h5
>
Add API Key
</
h5
>
<
h5
>
Add API Key
</
h5
>
<
form
className=
"gf-form-group"
onSubmit=
{
this
.
onAddApiKey
}
>
<
form
className=
"gf-form-group"
onSubmit=
{
this
.
onAddApiKey
}
>
<
div
className=
"gf-form-inline"
>
<
div
className=
"gf-form-inline"
>
...
...
public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
View file @
df60dbd7
...
@@ -49,14 +49,11 @@ exports[`Render should render CTA if there are no API keys 1`] = `
...
@@ -49,14 +49,11 @@ exports[`Render should render CTA if there are no API keys 1`] = `
<div
<div
className="cta-form"
className="cta-form"
>
>
<button
className="cta-form__close btn btn-transparent"
onClick={[Function]}
>
<IconButton
<IconButton
className="cta-form__close btn btn-transparent"
name="times"
name="times"
onClick={[Function]}
/>
/>
</button>
<h5>
<h5>
Add API Key
Add API Key
</h5>
</h5>
...
...
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