diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index d82f1a0be2..c4915e366d 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -363,7 +363,7 @@ echo sprintf('
', $menuTypeClass); 'images/send_feedback@header.svg', true, [ - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', 'title' => __('Feedback'), 'id' => 'feedback-header', 'alt' => __('Feedback'), @@ -417,7 +417,7 @@ echo sprintf('
', $menuTypeClass); true, [ 'title' => __('Edit my user'), - 'class' => 'main_menu_icon bot', + 'class' => 'main_menu_icon bot invert_filter', 'alt' => 'user', ] ); diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index e854a9ee23..ad51dbc59e 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -837,7 +837,7 @@ if ($agents !== false) { // Operating System icon column. $osIconColumn = html_print_div( [ - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', 'content' => ui_print_os_icon($agent['id_os'], false, true), ], true @@ -856,7 +856,7 @@ if ($agents !== false) { // Group icon and name column. $agentGroupIconColumn = html_print_div( [ - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', 'content' => ui_print_group_icon($agent['id_grupo'], true), ], true diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index 2a4f7d29af..6d85e4c0c9 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -188,7 +188,7 @@ if (empty($result) === false) { true, [ 'title' => __('Edit'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ).'  '; $data[1] .= ''.html_print_image( @@ -196,7 +196,7 @@ if (empty($result) === false) { true, [ 'title' => __('Delete'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ).''; } else { @@ -217,7 +217,7 @@ if (empty($result) === false) { true, [ 'title' => __('Edit'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ), ], @@ -233,7 +233,7 @@ if (empty($result) === false) { true, [ 'title' => __('Delete'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ), ], diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php index 876dedad72..8348f75398 100644 --- a/pandora_console/godmode/groups/modu_group_list.php +++ b/pandora_console/godmode/groups/modu_group_list.php @@ -281,10 +281,10 @@ if (empty($groups) === false) { if ($is_management_allowed === true) { $data[1] = ''.ui_print_truncate_text($id_group['name'], GENERIC_SIZE_TEXT).''; if (is_metaconsole() === true) { - $data[2] = ''.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).''; + $data[2] = ''.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).''; } else { $table->cellclass[][2] = 'table_action_buttons'; - $data[2] = ''.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).''; + $data[2] = ''.html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon invert_filter']).''; } } else { $data[1] = ''; diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php index fc25be5cd1..74446ec880 100644 --- a/pandora_console/godmode/modules/manage_nc_groups.php +++ b/pandora_console/godmode/modules/manage_nc_groups.php @@ -301,7 +301,7 @@ foreach ($groups as $group) { [ 'onClick' => 'if(confirm(\"'.__('Are you sure?').'\")) return true; else return false;', 'href' => 'index.php?sec='.$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg'].'&offset=0', - 'content' => html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon']), + 'content' => html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'main_menu_icon invert_filter']), ], true ); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index a17a1b8173..d310b99347 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -1181,7 +1181,7 @@ switch ($action) { true, [ 'title' => __('Edit'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ); $tableActionButtons[] = html_print_input_hidden( @@ -1211,7 +1211,7 @@ switch ($action) { true, [ 'title' => __('Duplicate'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ); $tableActionButtons[] = ' '; @@ -1226,7 +1226,7 @@ switch ($action) { true, [ 'title' => __('Delete'), - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon invert_filter', ] ); $tableActionButtons[] = html_print_input_hidden( diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index a31b3e587b..affe402379 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -493,7 +493,7 @@ if (empty($create) === false || empty($view) === false) { 'title' => __('Save changes'), 'href' => 'index.php?sec=gservers&sec2=godmode/servers/plugin&filemanager=1&tab=Attachments&id_plugin='.$form_id, 'class' => 'mrgn_lft_5px', - 'content' => html_print_image('images/validate.svg', true, ['class' => 'main_menu_icon invert_filter'], false, true), + 'content' => html_print_image('images/validate.svg', true, ['class' => 'invert_filter main_menu_icon'], false, true), ], true ); @@ -1003,7 +1003,7 @@ if (empty($create) === false || empty($view) === false) { true, [ 'title' => __('Lock'), - 'class' => 'main_menu_icon invert_filter', + 'class' => 'invert_filter main_menu_icon', ] ), ], diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php index 1fd8b57348..4a58a0a349 100644 --- a/pandora_console/godmode/setup/os.list.php +++ b/pandora_console/godmode/setup/os.list.php @@ -104,7 +104,7 @@ $table->data = []; foreach ($osList as $os) { $data = []; $data[] = $os['id_os']; - $data[] = html_print_div(['class' => 'main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true); + $data[] = html_print_div(['class' => 'invert_filter main_menu_icon', 'content' => ui_print_os_icon($os['id_os'], false, true)], true); if ($is_management_allowed === true) { if (is_metaconsole() === true) { $osNameUrl = 'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=edit&tab2=builder&id_os='.$os['id_os']; diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php index 5e7525405c..57e477c6d5 100644 --- a/pandora_console/godmode/users/profile_list.php +++ b/pandora_console/godmode/users/profile_list.php @@ -401,7 +401,7 @@ $img = html_print_image( true, [ 'border' => 0, - 'class' => 'main_menu_icon', + 'class' => 'invert_filter main_menu_icon', ] ); @@ -444,7 +444,7 @@ foreach ($profiles as $profile) { true, [ 'title' => __('Edit'), - 'class' => 'main_menu_icon', + 'class' => 'invert_filter main_menu_icon', ] ).''; if ((bool) check_acl($config['id_user'], 0, 'PM') === true || (bool) users_is_admin() === true) { @@ -457,7 +457,7 @@ foreach ($profiles as $profile) { true, [ 'title' => __('Delete'), - 'class' => 'main_menu_icon', + 'class' => 'invert_filter main_menu_icon', ] ), ], diff --git a/pandora_console/godmode/users/user_management.php b/pandora_console/godmode/users/user_management.php index 09bddade26..6969125a93 100644 --- a/pandora_console/godmode/users/user_management.php +++ b/pandora_console/godmode/users/user_management.php @@ -407,7 +407,7 @@ $select_out = html_print_select( true, '', false, - 'width:100%' + 'width:100%;' ); $select_in = html_print_select( @@ -422,7 +422,7 @@ $select_in = html_print_select( true, '', false, - 'width:100%' + 'width:100%;' ); // Full list pages generation. diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 5d39b7d401..c09d8225ca 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -4231,7 +4231,7 @@ function events_page_details($event, $server_id=0) $data = []; $data[0] = '
'.__('OS').'
'; - $data[1] = '
'; + $data[1] = '
'; $data[1] .= get_os_name($agent['id_os']); if (empty($agent['os_version']) === false) { $data[1] .= ' ('.$agent['os_version'].')'; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 561ce60853..ffaed35dc0 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -153,7 +153,7 @@ html { } body { - background-color: #fbfbfb; + background-color: #f6f7fb; margin: 0 auto; display: flex; flex-direction: column; @@ -10341,8 +10341,8 @@ button div.sound { } button div.add { - mask: url(../../images/plus.svg) no-repeat center / contain; - -webkit-mask: url(../../images/plus.svg) no-repeat center / contain; + mask: url(../../images/wizard@svg.svg) no-repeat center / contain; + -webkit-mask: url(../../images/wizard@svg.svg) no-repeat center / contain; } button div.delete { diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 194306f67a..7a873d620d 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -37,7 +37,9 @@ select, .edit_user_comments #textarea_comments, .discovery_textarea_input, .selection, -button.sub { +button.sub, +.select2-container .select2-selection--single, +.select2-container .select2-selection--multiple { background-color: #111 !important; color: #fff !important; } @@ -65,6 +67,14 @@ table.agent_info_table tr { color: #fff !important; } +div#head, +#menu_tabs { + border-bottom: 1px solid #1a1a1a; +} + +#menu_full { + border-right: 1px solid #111; +} .logo_green { background-color: #000; } @@ -89,6 +99,7 @@ table.agent_info_table tr { font-size: 10pt; } +.moduleIdBox, input[readonly] { background-color: #444 !important; color: #a2a2a2 !important; @@ -175,6 +186,11 @@ input.pure_full { background-color: #888; } +.p-slider:before { + background-color: #fff; + box-shadow: 0px 3px 6px #494949; + border: 1px solid #222; +} .fileupload_form, #button-pure { background-color: #222 !important; @@ -540,21 +556,20 @@ div#form_activate_licence #code { #menu_tab_frame, #menu_tab_frame_view, #menu_tab_frame_view_bc { + /* display: flex; align-items: flex-end; justify-content: space-between; - border-bottom: 2px solid #82b92e; - min-height: 50px; - width: calc(100% + 3em); + */ + border-bottom: 1px solid #82b92e; + /* + width: 100%; padding-right: 0px; margin-bottom: 20px; - height: 50px; + height: 53px; box-sizing: border-box; + */ background-color: #111 !important; - border-top-right-radius: 7px; - border-top-left-radius: 7px; - box-shadow: 1px 1px 4px rgba(160, 160, 160, 0.514); - margin-left: -3em; } .info_box { @@ -661,6 +676,7 @@ div#main_pure { position: static; } +div#main, body.pure { background-color: #111; } @@ -1007,6 +1023,7 @@ fieldset { input, textarea, select, +.moduleIdBox, .selection { border-color: #707070; } @@ -1024,6 +1041,9 @@ select, color: #fff !important; } +.white_table_graph { + background-color: #222 !important; +} table.databox { border-color: #707070; background-color: #222 !important; @@ -1143,6 +1163,13 @@ a.pandora_pagination, border: 1px solid #707070 !important; } +a.pandora_pagination { + background-color: #111; +} + +a.pandora_pagination:hover { + background-color: #555 !important; +} .dt-button.buttons-csv.buttons-html5 { filter: invert(100%); background-color: transparent; @@ -1299,3 +1326,35 @@ p.trademark-copyright { height: 80%; overflow: auto; } + +.action_buttons_background_mask { + background-color: #222; +} + +button.buttonButton, +button.submitButton { + box-shadow: 0px 3px 6px #111; +} + +.fixed_filter_bar { + background-color: #222; +} + +.section_table_title_line { + background-color: #008d86; +} + +.section_table_title { + color: #008d86; +} + +select[multiple] option:checked, +select[multiple] option:active { + background: #008d86; +} + +.select2-results + > .select2-results__options + > .select2-results__option.select2-results__option--highlighted { + background-color: #008d86; +} diff --git a/pandora_console/include/styles/select2_dark.min.css b/pandora_console/include/styles/select2_dark.min.css index ac15dd4af1..3780c18836 100644 --- a/pandora_console/include/styles/select2_dark.min.css +++ b/pandora_console/include/styles/select2_dark.min.css @@ -12,7 +12,7 @@ height: 28px; user-select: none; -webkit-user-select: none; - color: white; + color: white !important; } .select2-container .select2-selection--single .select2-selection__rendered { display: block; @@ -21,9 +21,12 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: white; + color: white !important; text-align: left; } +.select2-container--default>.selection>.select2-selection--single { + border-color: #707070 !important; +} .select2-container .select2-selection--single .select2-selection__clear { position: relative; } diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css index b98867c0d5..aac4efd283 100644 --- a/pandora_console/include/styles/tables.css +++ b/pandora_console/include/styles/tables.css @@ -190,14 +190,8 @@ /*margin-left: 0.5em;*/ } -.info_table > tbody > tr:last-child { - /*border-bottom: 1px solid #e2e2e2;*/ - border-top: 0; - /*border-bottom: 1px solid #c0ccdc;*/ - /* - border-left: 1px solid #c0ccdc; - border-right: 1px solid #c0ccdc; - */ +.info_table > tbody > tr:last-child > td { + border-bottom: 0; } .info_table > tbody > tr > th, .info_table > thead > tr > th,