Skip to content

Commit

Permalink
Merge pull request #21978 from votdev/improve_error_panel_mimic
Browse files Browse the repository at this point in the history
mimic: mgr/dashboard: Improve error panel

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
  • Loading branch information
LenzGr committed May 15, 2018
2 parents c58a8f8 + eafdae4 commit 50398d4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<alert type="danger">
<strong>
<i class="fa fa-exclamation-triangle fa-fw alert-danger"
aria-hidden="true"></i> {{ title }}
</strong>
<ng-content></ng-content>
<table>
<tr>
<td rowspan="2" class="error-panel-alert-icon">
<i class="fa fa-3x fa-exclamation-triangle alert-danger"
aria-hidden="true"></i>
</td>
<td class="error-panel-alert-title">
{{ title }}
</td>
</tr>
<tr>
<td class="error-panel-alert-text">
<ng-content></ng-content>
</td>
</tr>
</table>
</alert>

<div class="button-group text-right"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.error-panel-alert-icon {
vertical-align: top;
padding-right: 15px; // See @alert-padding in bootstrap/less/variables.less
}
.error-panel-alert-title {
font-weight: bold;
}
.error-panel-alert-text {
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
styleUrls: ['./error-panel.component.scss']
})
export class ErrorPanelComponent {

/**
* The title to be displayed. Defaults to 'Error!'.
* The title to be displayed. Defaults to 'Error'.
* @type {string}
*/
@Input() title = 'Error!';
@Input() title = 'Error';

/**
* The event that is triggered when the 'Back' button is pressed.
Expand Down

0 comments on commit 50398d4

Please sign in to comment.