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
4bc5945c
Commit
4bc5945c
authored
Jan 30, 2018
by
Daniel Lee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashfolders: remove inline styles
parent
f5107d50
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
12 deletions
+14
-12
public/app/core/components/Picker/DescriptionOption.tsx
+2
-8
public/app/stores/PermissionsStore/PermissionsStore.ts
+0
-4
public/sass/_grafana.scss
+1
-0
public/sass/components/_description-picker.scss
+11
-0
No files found.
public/app/core/components/Picker/DescriptionOption.tsx
View file @
4bc5945c
...
...
@@ -41,18 +41,12 @@ class DescriptionOption extends Component<IProps, any> {
onMouseEnter=
{
this
.
handleMouseEnter
}
onMouseMove=
{
this
.
handleMouseMove
}
title=
{
option
.
title
}
className=
{
`user-picker-option__button btn btn-link ${className} width-19`
}
style=
{
{
whiteSpace
:
'normal'
,
// height: '55px',
}
}
className=
{
`description-picker-option__button btn btn-link ${className} width-19`
}
>
<
div
className=
"gf-form"
>
{
children
}
</
div
>
<
div
className=
"gf-form"
>
<
div
className=
"muted width-17"
>
{
option
.
description
}
</
div
>
{
className
.
indexOf
(
'is-selected'
)
>
-
1
&&
(
<
i
style=
{
{
paddingLeft
:
'2px'
}
}
className=
"fa fa-check"
aria
-
hidden=
"true"
/>
)
}
{
className
.
indexOf
(
'is-selected'
)
>
-
1
&&
<
i
className=
"fa fa-check"
aria
-
hidden=
"true"
/>
}
</
div
>
</
button
>
);
...
...
public/app/stores/PermissionsStore/PermissionsStore.ts
View file @
4bc5945c
...
...
@@ -130,20 +130,16 @@ const prepareItem = (item, dashboardId: number, isFolder: boolean) => {
item
.
sortRank
=
0
;
if
(
item
.
userId
>
0
)
{
item
.
icon
=
'fa fa-fw fa-user'
;
// TODO: Check what sce.trustAsHtml did
// item.nameHtml = this.$sce.trustAsHtml(item.userLogin);
item
.
nameHtml
=
item
.
userLogin
;
item
.
sortName
=
item
.
userLogin
;
item
.
sortRank
=
10
;
}
else
if
(
item
.
teamId
>
0
)
{
item
.
icon
=
'fa fa-fw fa-users'
;
// item.nameHtml = this.$sce.trustAsHtml(item.team);
item
.
nameHtml
=
item
.
team
;
item
.
sortName
=
item
.
team
;
item
.
sortRank
=
20
;
}
else
if
(
item
.
role
)
{
item
.
icon
=
'fa fa-fw fa-street-view'
;
// item.nameHtml = this.$sce.trustAsHtml(`Everyone with <span class="query-keyword">${item.role}</span> Role`);
item
.
nameHtml
=
`Everyone with <span class="query-keyword">
${
item
.
role
}
</span> Role`
;
item
.
sortName
=
item
.
role
;
item
.
sortRank
=
30
;
...
...
public/sass/_grafana.scss
View file @
4bc5945c
...
...
@@ -91,6 +91,7 @@
@import
'components/popper'
;
@import
'components/form_select_box'
;
@import
'components/user-picker'
;
@import
'components/description-picker'
;
// PAGES
@import
'pages/login'
;
...
...
public/sass/components/_description-picker.scss
0 → 100644
View file @
4bc5945c
.description-picker-option__button
{
position
:
relative
;
text-align
:
left
;
width
:
100%
;
display
:
block
;
border-radius
:
0
;
white-space
:
normal
;
i
.fa-check
{
padding-left
:
2px
;
}
}
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