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-7824-problemas-vista-mobile' into 'develop' 

Fixed issues

Closes pandora_enterprise#7824

See merge request artica/pandorafms!4315
This commit is contained in:
Daniel Rodriguez 2021-08-17 12:20:18 +00:00
parent fe30b9c785 1aa788bd83
commit 8621d8cbb8
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/graphs/functions_flot.php
View File

@ -118,6 +118,7 @@ function flot_area_graph(
$array_events_alerts $array_events_alerts
) { ) {
global $config; global $config;
global $is_mobile;
// Get a unique identifier to graph. // Get a unique identifier to graph.
$graph_id = uniqid('graph_'); $graph_id = uniqid('graph_');
@ -145,7 +146,7 @@ function flot_area_graph(
break; break;
} }
if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null ) if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null) && (isset($is_mobile) === false || $is_mobile === false)
) { ) {
$background_style = '#222'; $background_style = '#222';
$params['grid_color'] = '#fff'; $params['grid_color'] = '#fff';

36
pandora_console/mobile/include/style/main.css
View File

@ -1,3 +1,37 @@
/**
*
* Default mobile theme
*
* @category Stylesheet
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
* @license See below
*
* ______ ___ _______ _______ ________
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
@font-face {
font-family: "lato";
src: url("../../../fonts/lato.woff2") format("woff");
font-weight: 400;
}
* { * {
text-decoration: none !important; text-decoration: none !important;
font-size: 12px; font-size: 12px;
@ -11,6 +45,8 @@ body {
margin: 0; margin: 0;
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
font-weight: 400;
font-family: "Lato";
} }
.small { .small {