瀏覽代碼

Merge pull request #15659 from surajshetty3416/fix-toast-style

version-14
Suraj Shetty 3 年之前
committed by GitHub
父節點
當前提交
1e70c02e43
沒有發現已知的金鑰在資料庫的簽署中 GPG 金鑰 ID: 4AEE18F83AFDEB23
共有 3 個檔案被更改,包括 49 行新增4 行删除
  1. +6
    -3
      frappe/public/js/frappe/ui/messages.js
  2. +22
    -0
      frappe/public/scss/desk/dark.scss
  3. +21
    -1
      frappe/public/scss/desk/toast.scss

+ 6
- 3
frappe/public/js/frappe/ui/messages.js 查看文件

@@ -365,7 +365,7 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
let indicator_icon_map = { let indicator_icon_map = {
'orange': "solid-warning", 'orange': "solid-warning",
'yellow': "solid-warning", 'yellow': "solid-warning",
'blue': "solid-success",
'blue': "solid-info",
'green': "solid-success", 'green': "solid-success",
'red': "solid-error" 'red': "solid-error"
}; };
@@ -387,8 +387,10 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
icon = 'solid-info'; icon = 'solid-info';
} }


const indicator = message.indicator || 'blue';

const div = $(` const div = $(`
<div class="alert desk-alert">
<div class="alert desk-alert ${indicator}">
<div class="alert-message-container"> <div class="alert-message-container">
<div class="alert-title-container"> <div class="alert-title-container">
<div>${frappe.utils.icon(icon, 'lg')}</div> <div>${frappe.utils.icon(icon, 'lg')}</div>
@@ -398,7 +400,8 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
</div> </div>
<div class="alert-body" style="display: none"></div> <div class="alert-body" style="display: none"></div>
<a class="close">${frappe.utils.icon('close-alt')}</a> <a class="close">${frappe.utils.icon('close-alt')}</a>
</div>`);
</div>
`);


div.hide().appendTo("#alert-container").show(); div.hide().appendTo("#alert-container").show();




+ 22
- 0
frappe/public/scss/desk/dark.scss 查看文件

@@ -166,4 +166,26 @@
color: var(--text-color); color: var(--text-color);
background: var(--gray-500); background: var(--gray-500);
} }

.desk-alert {
&.red {
--toast-bg: var(--red-900);
}

&.yellow {
--toast-bg: var(--yellow-900);
}

&.orange {
--toast-bg: var(--orange-900);
}

&.blue {
--toast-bg: var(--blue-900);
}

&.green {
--toast-bg: var(--green-900);
}
}
} }

+ 21
- 1
frappe/public/scss/desk/toast.scss 查看文件

@@ -9,7 +9,27 @@
} }
} }


#alert-container .desk-alert {
.desk-alert {
&.red {
--toast-bg: var(--red-100);
}

&.yellow {
--toast-bg: var(--yellow-50);
}

&.orange {
--toast-bg: var(--orange-50);
}

&.blue {
--toast-bg: var(--blue-50);
}

&.green {
--toast-bg: var(--green-50);
}

box-shadow: var(--modal-shadow); box-shadow: var(--modal-shadow);
width: 400px; width: 400px;
min-height: 50px; min-height: 50px;


Loading…
取消
儲存