From b80bfa2799c33f2aa6af2496b4e9fe4174176d04 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 4 Jan 2024 15:39:27 +0100 Subject: [PATCH] #12624 change of style in dialog 2 --- .../include/functions_register.php | 2 +- .../include/javascript/pandora_ui.js | 4 +- .../include/styles/js/datatables.min.css | 2 +- .../include/styles/js/jquery-ui_custom.css | 38 +++++++++++++++++-- pandora_console/include/styles/pandora.css | 2 +- .../include/styles/tips_window.css | 9 ++++- .../operation/visual_console/view.php | 2 +- .../resources/styles/um.css | 3 -- .../update_manager_client/views/register.php | 2 +- .../views/dashboard/tipsWindow.php | 2 +- 10 files changed, 49 insertions(+), 17 deletions(-) diff --git a/pandora_console/include/functions_register.php b/pandora_console/include/functions_register.php index e9c74c8c9a..db1bc8bf21 100644 --- a/pandora_console/include/functions_register.php +++ b/pandora_console/include/functions_register.php @@ -293,7 +293,7 @@ function show_configuration_wizard() { buttons: [ { "text": "No", - "class": 'submit-cancel', + "class": 'submit-cancel secondaryButton', "click" : function() { $(this).dialog("close"); } diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index cd71ef51c3..2d84d60794 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -157,7 +157,7 @@ function load_modal(settings) { required_buttons.push({ class: - "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel", + "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel secondaryButton", id: settings.modal.cancel_button_id, text: settings.modal.cancel, click: function() { @@ -574,7 +574,7 @@ function confirmDialog(settings, idDialog = uniqId()) { : settings.strCancelButton, class: hideCancelButton + - "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel", + "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel secondaryButton", click: function() { if (typeof settings.notCloseOnDeny == "undefined") { $(this).dialog("close"); diff --git a/pandora_console/include/styles/js/datatables.min.css b/pandora_console/include/styles/js/datatables.min.css index c5a5598611..e06d28a60b 100644 --- a/pandora_console/include/styles/js/datatables.min.css +++ b/pandora_console/include/styles/js/datatables.min.css @@ -865,7 +865,7 @@ body .ui-tooltip { color: #333; } .ui-dialog .ui-widget-header { - margin: -3px -3px 0px -3px; + /* margin: -3px -3px 0px -3px; */ } .ui-state-default, .ui-widget-content .ui-state-default, diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css index 1c68f9783e..440540ab05 100644 --- a/pandora_console/include/styles/js/jquery-ui_custom.css +++ b/pandora_console/include/styles/js/jquery-ui_custom.css @@ -14,7 +14,7 @@ margin: 0; display: inherit; text-align: left; - padding: 1.2em 33px 1.2em 12px; + padding: 1.2em 33px 1.2em 12px !important; height: 30px; position: relative; overflow: hidden; @@ -102,6 +102,36 @@ border: 1px solid #82b92e; height: 30px; width: 90px; + border: 2px solid var(--primary-color) !important; +} + +button.secondaryButton { + background-color: #fff !important; + color: var(--primary-color) !important; + border: 2px solid var(--primary-color) !important; + box-shadow: none; +} + +button.secondaryButton > div { + background-color: var(--primary-color) !important; +} + +button.secondaryButton:hover { + color: #1d7873 !important; + border-color: #1d7873 !important; +} + +button.secondaryButton:hover > div { + background-color: #1d7873 !important; +} + +button.secondaryButton:active { + color: #0d312f !important; + border-color: #0d312f !important; +} + +button.secondaryButton:active > div { + background-color: #0d312f !important; } .ui-datepicker-prev { @@ -252,7 +282,7 @@ a.ui-state-default > span:hover { border-bottom-right-radius: 10px !important; box-shadow: 0 10px 6px 0 rgb(0 0 0 / 13%); border: 1px solid #e5e9ed; - padding: 0; + padding: 0 !important; } .ui-dialog-titlebar { border: 0px; @@ -270,8 +300,8 @@ a.ui-state-default > span:hover { .ui-button.ui-corner-all.ui-widget.ui-button-icon-only.ui-dialog-titlebar-close, .ui-button.ui-corner-all.ui-widget.ui-button-icon-only.ui-dialog-titlebar-close:hover { background-color: #fff; - mask: url(../../../images/close@svg.svg) no-repeat right / contain; - -webkit-mask: url(../../../images/close@svg.svg) no-repeat right / contain; + mask: url(../../../images/close_dialog.svg) no-repeat right / contain; + -webkit-mask: url(../../../images/close_dialog.svg) no-repeat right / contain; } .ui-dialog-title { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 94d337bdbe..75059d8370 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10454,7 +10454,7 @@ button.submitButton { display: flex; justify-content: space-between; flex-direction: row; - min-width: 110px; + /* min-width: 110px; */ height: 45px; font-size: 14px; /*font-family: "lato";*/ diff --git a/pandora_console/include/styles/tips_window.css b/pandora_console/include/styles/tips_window.css index 5c6114f92a..4c50f7214c 100644 --- a/pandora_console/include/styles/tips_window.css +++ b/pandora_console/include/styles/tips_window.css @@ -28,9 +28,10 @@ border-top-right-radius: 10px !important; } .tips_header .title { - font-size: 15px; + font-size: 13pt !important; color: #fff; - padding: 1.2em 33px 1.2em 12px !important; + padding: 1em 33px 1em 12px !important; + margin: 0; } .description { padding: 0px 20px 20px 20px; @@ -91,6 +92,10 @@ width: 100%; justify-content: space-between; } + +.ui-dialog-titlebar > p { + display: flex; +} #tips_window_modal .ui-dialog-buttonset button.submit-cancel-tips, #tips_window_modal_preview .ui-dialog-buttonset button.submit-cancel-tips { border-radius: 6px; diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php index 6f193c05c5..7d44c7b69b 100644 --- a/pandora_console/operation/visual_console/view.php +++ b/pandora_console/operation/visual_console/view.php @@ -901,7 +901,7 @@ if ($edit_capable === true) { draggable: true, modal: true, close: false, - height: 200, + height: 210, width: 480, overlay: { opacity: 0.5, diff --git a/pandora_console/update_manager_client/resources/styles/um.css b/pandora_console/update_manager_client/resources/styles/um.css index fe28eaa176..cd88b1d30d 100644 --- a/pandora_console/update_manager_client/resources/styles/um.css +++ b/pandora_console/update_manager_client/resources/styles/um.css @@ -321,9 +321,6 @@ a.update_manager_button:after { margin: 20px; } -.ui-widget.ui-widget-content { - border: none; -} #um-update-details { display: none; background: #fff; diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php index 5c05d04678..bfc70570f3 100644 --- a/pandora_console/update_manager_client/views/register.php +++ b/pandora_console/update_manager_client/views/register.php @@ -156,7 +156,7 @@ $("#submit-cancel_registration").click(function(e) { buttons: [ { text: "No", - class: "submit-cancel", + class: "submit-cancel secondaryButton", click: function() { $(this).dialog("close"); } diff --git a/pandora_console/views/dashboard/tipsWindow.php b/pandora_console/views/dashboard/tipsWindow.php index 573a11abcc..d2714ae1f2 100644 --- a/pandora_console/views/dashboard/tipsWindow.php +++ b/pandora_console/views/dashboard/tipsWindow.php @@ -41,7 +41,7 @@ $output .= '

'.html_print_checkbox( false, '', ($preview === true) ? '' : 'checkbox_tips_startup' -).__('Show usage tips at startup').'

'; +).' '.__('Show usage tips at startup').'

'; $output .= ''; $output .= '
'; $output .= '
';