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
86159120
Commit
86159120
authored
Sep 27, 2017
by
Patrick O'Carroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated css and html for recent state changes for alert lists
parent
2ed75323
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
28 deletions
+67
-28
public/app/features/alerting/partials/alert_tab.html
+9
-14
public/app/plugins/panel/alertlist/module.html
+12
-12
public/sass/pages/_alerting.scss
+46
-2
No files found.
public/app/features/alerting/partials/alert_tab.html
View file @
86159120
...
@@ -77,7 +77,6 @@
...
@@ -77,7 +77,6 @@
</ul>
</ul>
</label>
</label>
</div>
</div>
</div>
</div>
<div
class=
"gf-form-group"
>
<div
class=
"gf-form-group"
>
...
@@ -147,23 +146,19 @@
...
@@ -147,23 +146,19 @@
<section
class=
"card-section card-list-layout-list"
>
<section
class=
"card-section card-list-layout-list"
>
<ol
class=
"card-list"
>
<ol
class=
"card-list"
>
<li
class=
"card-item-wrapper"
ng-repeat=
"ah in ctrl.alertHistory"
>
<li
class=
"card-item-wrapper"
ng-repeat=
"ah in ctrl.alertHistory"
>
<div
class=
"card-item card-item--alert"
>
<div
class=
"alert-list card-item card-item--alert"
>
<div
class=
"card-item-header"
>
<div
class=
"alert-list-body"
>
<div
class=
"card-item-type"
>
<div
class=
"alert-list-icon alert-list-item-state {{ah.stateModel.stateClass}}"
>
</div>
</div>
<div
class=
"card-item-body"
>
<div
class=
"card-item-details"
>
<div
class=
"card-item-sub-name"
>
<span
class=
"alert-list-item-state {{ah.stateModel.stateClass}}"
>
<i
class=
"{{ah.stateModel.iconClass}}"
></i>
<i
class=
"{{ah.stateModel.iconClass}}"
></i>
{{ah.stateModel.text}}
</span>
{{ah.time}}
</div>
</div>
<div
class=
"card-item-sub-name"
>
<div
class=
"alert-list-main"
>
{{ah.info}}
<p
class=
"alert-list-state alert-list-text {{ah.stateModel.stateClass}}"
>
{{ah.stateModel.text}}
</p>
<p
class=
"alert-list-text"
>
{{ah.info}}
</p>
</div>
</div>
</div>
</div>
<div
class=
"alert-list-footer"
>
<p
class=
"alert-list-text"
>
{{ah.time}}
</p>
<p
class=
"alert-list-text"
>
Img Link ->
</p>
</div>
</div>
</div>
</div>
</li>
</li>
...
...
public/app/plugins/panel/alertlist/module.html
View file @
86159120
...
@@ -27,22 +27,22 @@
...
@@ -27,22 +27,22 @@
</section>
</section>
<section
class=
"card-section card-list-layout-list"
ng-if=
"ctrl.panel.show === 'changes'"
>
<section
class=
"card-section card-list-layout-list"
ng-if=
"ctrl.panel.show === 'changes'"
>
<ol
class=
"card-list"
>
<ol
class
=
"card-list"
>
<li
class=
"card-item-wrapper"
ng-repeat=
"al in ctrl.alertHistory"
>
<li
class=
"card-item-wrapper"
ng-repeat=
"al in ctrl.alertHistory"
>
<div
class=
"card-item card-item--alert"
>
<div
class=
"alert-list card-item card-item--alert"
>
<div
class=
"card-item-header"
>
<div
class=
"alert-list-body"
>
<div
class=
"card-item-sub-name"
>
{{al.time}}
</div>
<div
class=
"alert-list-icon alert-list-item-state {{al.stateModel.stateClass}}"
>
</div>
<div
class=
"card-item-body"
>
<div
class=
"card-item-details"
>
<div
class=
"card-item-notice"
>
{{al.title}}
</div>
<div
class=
"card-item-sub-name"
>
<span
class=
"alert-list-item-state {{al.stateModel.stateClass}}"
>
<i
class=
"{{al.stateModel.iconClass}}"
></i>
<i
class=
"{{al.stateModel.iconClass}}"
></i>
{{al.stateModel.text}}
</div>
</span>
{{al.info}}
<div
class=
"alert-list-main"
>
<p
class=
"alert-list-title"
>
{{al.title}}
</p>
<p
class=
"alert-list-state alert-list-text {{al.stateModel.stateClass}}"
>
{{al.stateModel.text}}
</p>
<p
class=
"alert-list-text"
>
{{al.info}}
</p>
</div>
</div>
</div>
</div>
<div
class=
"alert-list-footer"
>
<p
class=
"alert-list-text"
>
{{al.time}}
</p>
<p
class=
"alert-list-text"
>
Img Link ->
</p>
</div>
</div>
</div>
</div>
</li>
</li>
...
...
public/sass/pages/_alerting.scss
View file @
86159120
...
@@ -30,15 +30,59 @@
...
@@ -30,15 +30,59 @@
// Alert List
// Alert List
.alert-list-item-state
{
.alert-list
{
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
}
.alert-list-icon
{
font-weight
:
bold
;
font-weight
:
bold
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
.icon-gf
,
.fa
{
.icon-gf
,
.fa
{
font-size
:
12
0%
;
font-size
:
20
0%
;
position
:
relative
;
position
:
relative
;
top
:
2px
;
top
:
2px
;
}
}
}
}
.alert-list-body
{
display
:
flex
;
}
.alert-list-main
{
padding
:
0
2rem
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
}
.alert-list-title
{
font-size
:
$font-size-base
;
margin
:
0
;
font-weight
:
600
;
}
.alert-list-state
{
font-weight
:
bold
;
}
.alert-list-text
{
font-size
:
$font-size-sm
;
margin
:
0
;
line-height
:
1
.5rem
;
}
.alert-list-footer
{
display
:
flex
;
justify-content
:
space-between
;
flex-direction
:
column
;
align-items
:
flex-end
;
color
:
$text-color-weak
;
}
.panel-has-alert
{
.panel-has-alert
{
.panel-alert-icon
:before
{
.panel-alert-icon
:before
{
content
:
"\e611"
;
content
:
"\e611"
;
...
...
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