tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13399-elementos-consolas-visuales-no-respetan-posicion-en-widget-dashboard' into 'develop' 

Ent 13399 elementos consolas visuales no respetan posicion en widget dashboard

See merge request artica/pandorafms!7163
This commit is contained in:
Juan Antonio Loarte 2024-04-11 08:47:07 +00:00
parent 286f46aee3 ad78eaf2ef
commit aaa3761a86
5 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/javascript/pandora_visual_console.js
View File

@ -471,6 +471,8 @@ function createVisualConsole(
// Start an interval to update the Visual Console. // Start an interval to update the Visual Console.
updateVisualConsole(props.id, updateInterval, updateInterval); updateVisualConsole(props.id, updateInterval, updateInterval);
} }
normalizeStylesVC();
} catch (error) { } catch (error) {
console.log("[ERROR]", "[VISUAL-CONSOLE-CLIENT]", error.message); console.log("[ERROR]", "[VISUAL-CONSOLE-CLIENT]", error.message);
} }
@ -2062,3 +2064,9 @@ function center_labels() {
} }
}); });
} }
function normalizeStylesVC() {
$(".visual-console-container-dashboard h1").addClass("unbootstrap");
$(".visual-console-container-dashboard h2").addClass("unbootstrap");
$(".visual-console-container-dashboard .graph").addClass("unbootstrap");
}

2
pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php
View File

@ -493,7 +493,7 @@ class MapsMadeByUser extends Widget
$output .= '<script type="text/javascript">'; $output .= '<script type="text/javascript">';
$output .= '$(document).ready(function () {'; $output .= '$(document).ready(function () {';
$output .= 'dashboardLoadVC('.$settings.')'; $output .= 'dashboardLoadVC('.$settings.');';
$output .= '});'; $output .= '});';
$output .= '</script>'; $output .= '</script>';

36
pandora_console/include/styles/bootstrap.min.css vendored
View File

@ -71,12 +71,12 @@ hr {
height: 0; height: 0;
overflow: visible; overflow: visible;
} }
h1, h1:not(.unbootstrap),
h2, h2:not(.unbootstrap),
h3, h3:not(.unbootstrap),
h4, h4:not(.unbootstrap),
h5, h5:not(.unbootstrap),
h6 { h6:not(.unbootstrap) {
margin-top: 0; margin-top: 0;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
@ -311,18 +311,18 @@ template {
[hidden] { [hidden] {
display: none !important; display: none !important;
} }
.h1, .h1:not(.unbootstrap),
.h2, .h2:not(.unbootstrap),
.h3, .h3:not(.unbootstrap),
.h4, .h4:not(.unbootstrap),
.h5, .h5:not(.unbootstrap),
.h6, .h6:not(.unbootstrap),
h1, h1:not(.unbootstrap),
h2, h2:not(.unbootstrap),
h3, h3:not(.unbootstrap),
h4, h4:not(.unbootstrap),
h5, h5:not(.unbootstrap),
h6 { h6:not(.unbootstrap) {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
font-weight: 500; font-weight: 500;
line-height: 1.2; line-height: 1.2;

2
pandora_console/include/styles/bootstrap.min.css.map
View File

File diff suppressed because one or more lines are too long

13
pandora_console/include/styles/dashboards.css
View File

@ -46,16 +46,11 @@ a {
text-decoration: none; text-decoration: none;
} }
h1 { h1:not(.unbootstrap) {
font-size: 2.5rem; font-size: 2.5rem;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
.visual-console-container-dashboard h1 {
font-size: inherit;
margin-bottom: inherit;
}
.container-fluid { .container-fluid {
margin-top: 5px; margin-top: 5px;
} }
@ -971,7 +966,7 @@ input.resize_button {
right: 20px; right: 20px;
} }
.parent_graph > .graph { .parent_graph > .graph:not(.unbootstrap) {
margin-left: 10px; margin-left: 10px;
} }
@ -1001,3 +996,7 @@ input.resize_button {
.select2-search__field { .select2-search__field {
box-sizing: border-box !important; box-sizing: border-box !important;
} }
.grid-stack-item-content .visual-console-container-dashboard {
text-align: initial;
}