Merge from develop
This commit is contained in:
commit
7f2535543b
|
@ -48,6 +48,7 @@
|
|||
"src/assets/common-assets/library-css/material.scss"
|
||||
],
|
||||
"scripts": [
|
||||
"src/assets/common-assets/js/copy.js",
|
||||
"node_modules/uikit/dist/js/uikit.min.js",
|
||||
"node_modules/uikit/dist/js/uikit-icons.min.js",
|
||||
"node_modules/jquery/dist/jquery.js"
|
||||
|
|
|
@ -223,7 +223,7 @@
|
|||
</a>
|
||||
</div>
|
||||
<div *ngIf="indicator.descriptionOverlay && (indicator.description || indicator.additionalDescription)"
|
||||
class="indicator-description uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
|
||||
class="indicator-overlay uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
|
||||
<div class="inner" click-outside-or-esc
|
||||
(clickOutside)="closeDescriptionOverlay($event, indicator)">
|
||||
<div class="uk-padding-small">
|
||||
|
|
|
@ -5,20 +5,3 @@
|
|||
opacity: 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
.indicator-description {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background: @global-overlay-background;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
.inner {
|
||||
background: @global-background;
|
||||
border-radius: @global-border-radius;
|
||||
width: 75%;
|
||||
max-height: 75%;
|
||||
overflow: auto;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e63d61b4693843c30ed41440e90bd3b6b6865806
|
||||
Subproject commit 9fc6d0c0a01962ed38c7304e0b731918f040107d
|
|
@ -1 +1 @@
|
|||
Subproject commit e82544c43fa55393581d5278a8b0540d64bf30f0
|
||||
Subproject commit 5812ba80f1174b4b08066a70e2e2da8b4879f6e9
|
|
@ -1 +1 @@
|
|||
Subproject commit 921802642010c1057b79de55f93361f0b25a7b3d
|
||||
Subproject commit 8667e43d577f4db8bf5ce8df30ce39190be5ee90
|
|
@ -5,6 +5,7 @@
|
|||
@import "~src/assets/common-assets/less/general";
|
||||
@import "~src/assets/common-assets/less/user";
|
||||
@import "~src/assets/common-assets/less/dashboard";
|
||||
@import "~src/assets/common-assets/less/indicators";
|
||||
@import "~src/assets/common-assets/less/ckeditor";
|
||||
@import "~src/assets/monitor-dashboard-custom";
|
||||
@import "assets/print.css";
|
||||
|
|
Loading…
Reference in New Issue