IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up html/sass and added final touches

Browse Source
This commit is contained in:
Patrick O'Carroll 2017-09-28 09:41:33 +02:00
parent 8615912018
commit 0d5540ca09
3 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/alerting/partials/alert_tab.html
View File

@ -151,14 +151,14 @@
<div class="alert-list-icon alert-list-item-state {{ah.stateModel.stateClass}}">
<i class="{{ah.stateModel.iconClass}}"></i>
</div>
<div class="alert-list-main">
<p class="alert-list-state alert-list-text {{ah.stateModel.stateClass}}">{{ah.stateModel.text}}</p>
<p class="alert-list-text">{{ah.info}}</p>
<div class="alert-list-main alert-list-text">
<span class="alert-list-state {{ah.stateModel.stateClass}}">{{ah.stateModel.text}}</span>
<span class="alert-list-info">{{ah.info}}</span>
</div>
</div>
<div class="alert-list-footer">
<p class="alert-list-text">{{ah.time}}</p>
<p class="alert-list-text">Img Link -></p>
<div class="alert-list-footer alert-list-text">
<span>{{ah.time}}</span>
<span><!--Img Link--></span>
</div>
</div>
</li>

40
public/app/plugins/panel/alertlist/module.html
View File

@ -2,24 +2,22 @@
<section class="card-section card-list-layout-list" ng-if="ctrl.panel.show === 'current'">
<ol class="card-list">
<li class="card-item-wrapper" ng-repeat="alert in ctrl.currentAlerts">
<div class="card-item card-item--alert">
<div class="card-item-body">
<div class="card-item-details">
<div class="card-item-notice">
<a href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit&tab=alert">
{{alert.name}}
</a>
</div>
<div class="card-item-sub-name">
<span class="alert-list-item-state {{alert.stateModel.stateClass}}">
<div class="alert-list card-item card-item--alert">
<div class="alert-list-body">
<div class="alert-list-icon alert-list-item-state {{alert.stateModel.stateClass}}">
<i class="{{alert.stateModel.iconClass}}"></i>
{{alert.stateModel.text}}
</span> for {{alert.newStateDateAgo}}
</div>
<div class="small muted" ng-show="alert.executionError">
{{alert.executionError}}
</div>
</div>
<div class="alert-list-main">
<p class="alert-list-title">
<a href="dashboard/{{alert.dashboardUri}}?panelId={{alert.panelId}}&fullscreen&edit&tab=alert">
{{alert.name}}
</a>
</p>
<p class="alert-list-text">
<span class="alert-list-state {{alert.stateModel.stateClass}}">{{alert.stateModel.text}}</span>
for {{alert.newStateDateAgo}}
</p>
</div>
</div>
</div>
</li>
@ -36,13 +34,15 @@
</div>
<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 class="alert-list-text">
<span class="alert-list-state {{al.stateModel.stateClass}}">{{al.stateModel.text}}</span>
<span class="alert-list-info alert-list-info-left">{{al.info}}</span>
</div>
</div>
</div>
<div class="alert-list-footer">
<p class="alert-list-text">{{al.time}}</p>
<p class="alert-list-text">Img Link -></p>
<span class="alert-list-text">{{al.time}}</span>
<span class="alert-list-text"><!--Img Link--></span>
</div>
</div>
</li>

10
public/sass/pages/_alerting.scss
View File

@ -73,6 +73,15 @@
font-size: $font-size-sm;
margin: 0;
line-height: 1.5rem;
color: $text-color-weak;
}
.alert-list-info {
color: $text-color;
}
.alert-list-info-left {
padding-left: 2rem;
}
.alert-list-footer {
@ -80,7 +89,6 @@
justify-content: space-between;
flex-direction: column;
align-items: flex-end;
color: $text-color-weak;
}
.panel-has-alert {