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-12624-cambio-estilo-de-ventanas-modales' into 'develop' 

Ent 12624 cambio estilo de ventanas modales

See merge request artica/pandorafms!6826
This commit is contained in:
Matias Didier 2024-01-23 09:44:21 +00:00
parent b11651aa6e b220cc1eb4
commit eba0ce9e80
11 changed files with 80 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/images/close_dialog.svg Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>F911E81E-C05E-4E17-B88A-07CFEEBD0229</title>
<g id="Support" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Pandora-ITSM---Soporte---4d2-Contact-info-popup" transform="translate(-410, -34)">
<g id="Content" transform="translate(10, 10)">
<g id="popup-close" transform="translate(400, 24)">
<rect id="Rectangle" x="0" y="0" width="20" height="20"></rect>
<path d="M2.46745396,2.46745396 C3.09072592,1.84418201 4.10124942,1.84418201 4.72452137,2.46745396 L10,7.743 L15.2754786,2.46745396 C15.8987506,1.84418201 16.9092741,1.84418201 17.532546,2.46745396 C18.1168635,3.05177142 18.1533833,3.97644668 17.6421056,4.60330886 L17.532546,4.72452137 L12.257,10 L17.532546,15.2754786 L17.6421056,15.3966911 C18.1533833,16.0235533 18.1168635,16.9482286 17.532546,17.532546 C16.9092741,18.155818 15.8987506,18.155818 15.2754786,17.532546 L10,12.257 L4.72452137,17.532546 C4.10124942,18.155818 3.09072592,18.155818 2.46745396,17.532546 C1.88313651,16.9482286 1.84661667,16.0235533 2.35789444,15.3966911 L2.46745396,15.2754786 L7.743,10 L2.46745396,4.72452137 L2.35789444,4.60330886 C1.84661667,3.97644668 1.88313651,3.05177142 2.46745396,2.46745396 Z" id="Path-6" fill="#FFFFFF"></path>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
pandora_console/include/functions_register.php
View File

@ -293,7 +293,7 @@ function show_configuration_wizard() {
buttons: [
{
"text": "No",
"class": 'submit-cancel',
"class": 'submit-cancel secondaryButton',
"click" : function() {
$(this).dialog("close");
}

4
pandora_console/include/javascript/pandora_ui.js
View File

@ -166,7 +166,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() {
@ -592,7 +592,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");

2
pandora_console/include/styles/js/datatables.min.css vendored
View File

@ -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,

61
pandora_console/include/styles/js/jquery-ui_custom.css
View File

@ -9,16 +9,19 @@
}
.ui-dialog .ui-dialog-titlebar {
background-color: transparent;
background: linear-gradient(to right, #161628, #1b6a66);
border-radius: 0;
margin: 0;
display: inherit;
text-align: left;
padding: 0.4em 33px 0.4em 12px;
padding: 1.2em 33px 1.2em 12px !important;
height: 30px;
position: relative;
overflow: hidden;
text-overflow: ellipsis;
color: #fff;
border-top-left-radius: 10px !important;
border-top-right-radius: 10px !important;
}
/*center ui dialog center*/
@ -35,14 +38,14 @@
color: #111;
}
.ui-dialog .ui-dialog-title {
color: rgb(51, 51, 51);
color: #fff;
white-space: nowrap;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
position: relative;
font-size: 11pt;
top: 2px;
font-size: 13pt;
/* top: 2px; */
}
.ui-dialog .ui-dialog-titlebar-minimize {
@ -99,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 {
@ -214,7 +247,7 @@ a.ui-state-default > span:hover {
height: fit-content !important;
}
.ui-dialog .ui-widget-header {
margin: 3px 3px 0px 3px;
/* margin: 3px 3px 0px 3px; */
}
.ui_tpicker_hour,
.ui_tpicker_minute,
@ -243,13 +276,13 @@ a.ui-state-default > span:hover {
border-radius: 16px;
}
.ui-dialog {
border-top-left-radius: 16px !important;
border-top-right-radius: 16px !important;
border-bottom-left-radius: 16px !important;
border-bottom-right-radius: 16px !important;
border-top-left-radius: 10px !important;
border-top-right-radius: 10px !important;
border-bottom-left-radius: 10px !important;
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;
@ -266,9 +299,9 @@ 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: rgb(51, 51, 51);
mask: url(../../../images/close@svg.svg) no-repeat right / contain;
-webkit-mask: url(../../../images/close@svg.svg) no-repeat right / contain;
background-color: #fff;
mask: url(../../../images/close_dialog.svg) no-repeat right / contain;
-webkit-mask: url(../../../images/close_dialog.svg) no-repeat right / contain;
}
.ui-dialog-title {

2
pandora_console/include/styles/pandora.css
View File

@ -10490,7 +10490,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";*/

15
pandora_console/include/styles/tips_window.css
View File

@ -23,12 +23,15 @@
justify-content: space-between;
height: fit-content !important;
background-color: white;
color: #161628;
border-top-left-radius: 25px !important;
border-top-right-radius: 25px !important;
color: #fff;
border-top-left-radius: 10px !important;
border-top-right-radius: 10px !important;
}
.tips_header .title {
font-size: 15px;
font-size: 13pt !important;
color: #fff;
padding: 1em 33px 1em 12px !important;
margin: 0;
}
.description {
padding: 0px 20px 20px 20px;
@ -89,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;

2
pandora_console/operation/visual_console/view.php
View File

@ -901,7 +901,7 @@ if ($edit_capable === true) {
draggable: true,
modal: true,
close: false,
height: 200,
height: 210,
width: 480,
overlay: {
opacity: 0.5,

3
pandora_console/update_manager_client/resources/styles/um.css
View File

@ -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;

2
pandora_console/update_manager_client/views/register.php
View File

@ -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");
}

2
pandora_console/views/dashboard/tipsWindow.php
View File

@ -41,7 +41,7 @@ $output .= '<p>'.html_print_checkbox(
false,
'',
($preview === true) ? '' : 'checkbox_tips_startup'
).__('Show usage tips at startup').'</p>';
).'&nbsp;'.__('Show usage tips at startup').'</p>';
$output .= '</div>';
$output .= '<div class="carousel '.((empty($files) === true && empty($files64) === true) ? 'invisible' : '').'">';
$output .= '<div class="images">';