Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF

This commit is contained in:
fbsanchez 2019-11-15 16:52:26 +01:00
commit 46c42ef8a4
2 changed files with 10 additions and 1 deletions

View File

@ -2969,7 +2969,7 @@ function ui_progress_extend(
ui_require_css_file('progress');
// Main container.
$output .= '<div class="progress_main" ';
$output .= '<div class="progress_main_noborder" ';
$output .= '" style="width:'.$data['width'].'%;';
$output .= ' height:'.$data['height'].'em;">';

View File

@ -6,6 +6,15 @@
display: inline-block;
display: flex;
}
.progress_main_noborder {
height: 2.5em;
position: relative;
width: 100%;
display: inline-block;
display: flex;
}
.progress_main:before {
content: attr(data-label);
position: absolute;