diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css
index f3d2dc00bf..fb5690b8a9 100644
--- a/frappe/desk/page/desktop/desktop.css
+++ b/frappe/desk/page/desktop/desktop.css
@@ -267,7 +267,7 @@
height: var(--folder-thumbnail-icon-height);
width: var(--folder-thumbnail-icon-height);
padding: 0px;
- border-radius: 2px;
+ border-radius: 4px;
& .icon{
width: 5px;
height: 5px;
@@ -527,4 +527,4 @@
height: 100%;
background: none;
color: var(--neutral-white);
-}
\ No newline at end of file
+}
diff --git a/frappe/desk/page/desktop/desktop.js b/frappe/desk/page/desktop/desktop.js
index 0c9de51ca3..e1d475d012 100644
--- a/frappe/desk/page/desktop/desktop.js
+++ b/frappe/desk/page/desktop/desktop.js
@@ -432,7 +432,7 @@ class DesktopPage {
},
{
icon: "rotate-ccw",
- label: "Reset to Default",
+ label: "Reset Desktop Layout",
onClick: function () {
reset_to_default();
window.location.reload();
diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index 321c1f93f9..5d676259a6 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -347,12 +347,12 @@ frappe.get_modal = function (title, content) {
${title}
-
-
diff --git a/frappe/public/js/frappe/ui/menu.js b/frappe/public/js/frappe/ui/menu.js
index 1b84ffa725..d918f2740b 100644
--- a/frappe/public/js/frappe/ui/menu.js
+++ b/frappe/public/js/frappe/ui/menu.js
@@ -103,10 +103,13 @@ frappe.ui.menu = class ContextMenu {
${iconMarkup}
-
-
+ ${
+ item.items && item.items.length
+ ? ``
+ : ""
+ }
`);
if (!item.url) {
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 0125e64267..0d7b67f2bf 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1397,7 +1397,7 @@ Object.assign(frappe.utils, {
return icon_html.get(0).outerHTML;
},
desktop_pallete: {
- blue: "#0981E3",
+ blue: "#0289F7",
gray: "#7B808A",
},
icon(
diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss
index dcb8e68e38..24e2dcdad2 100644
--- a/frappe/public/scss/common/buttons.scss
+++ b/frappe/public/scss/common/buttons.scss
@@ -87,6 +87,19 @@
}
}
+.btn.btn-ghost {
+ background-color: transparent;
+ color: var(--text-color);
+ &:hover,
+ &:active {
+ background-color: var(--btn-ghost-hover-bg);
+ color: var(--text-color);
+ }
+ &:focus-visible {
+ box-shadow: var(--focus-default) !important;
+ }
+}
+
.btn.btn-default {
background-color: var(--control-bg);
color: var(--text-color);
diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss
index 0fd3fb902c..49227fdd54 100644
--- a/frappe/public/scss/common/css_variables.scss
+++ b/frappe/public/scss/common/css_variables.scss
@@ -99,6 +99,7 @@ $disabled-input-height: 22px;
--btn-primary: var(--gray-900);
--btn-default-bg: var(--gray-100);
--btn-default-hover-bg: var(--gray-300);
+ --btn-ghost-hover-bg: var(--gray-200);
// Border Colors
--border-primary: var(--gray-900);
diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss
index 4c2a57c581..e9cd4f79e8 100644
--- a/frappe/public/scss/common/modal.scss
+++ b/frappe/public/scss/common/modal.scss
@@ -33,6 +33,8 @@ body.modal-open[style^="padding-right"] {
border-color: var(--border-color);
}
.modal-header {
+ display: flex;
+ align-items: center;
position: sticky;
top: 0;
z-index: 3;
@@ -53,15 +55,11 @@ body.modal-open[style^="padding-right"] {
}
.modal-actions {
+ margin-right: -6px;
.btn-modal-minimize {
- padding-right: 0;
-
.icon {
width: 14px;
height: 14px;
- use {
- stroke: var(--gray-500);
- }
}
}
}
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index b73764cc76..69626dd6b8 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -42,6 +42,7 @@ $check-icon-dark: url("data:image/svg+xml,