From 351fa2a1ea887cbc5180dab535fd49fb2fe21afc Mon Sep 17 00:00:00 2001 From: sokumon Date: Sat, 15 Nov 2025 12:45:56 +0530 Subject: [PATCH] fix: remove a setting from desktop settings --- frappe/boot.py | 1 - .../desktop_settings/desktop_settings.json | 17 ++--------------- .../desktop_settings/desktop_settings.py | 1 - frappe/desk/page/desktop/desktop.css | 13 ++++++++----- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index 77ca3523b8..0fbb110d09 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -151,7 +151,6 @@ def load_desktop_data(bootinfo): bootinfo.desktop_icons = get_desktop_icons() bootinfo.workspaces = get_workspace_sidebar_items() - bootinfo.app_name_style = frappe.db.get_single_value("Desktop Settings", "show_app_name_in_header") bootinfo.show_app_icons_as_folder = frappe.db.get_single_value( "Desktop Settings", "show_app_icons_as_folder" ) diff --git a/frappe/desk/doctype/desktop_settings/desktop_settings.json b/frappe/desk/doctype/desktop_settings/desktop_settings.json index e2a1b8346c..006f17018f 100644 --- a/frappe/desk/doctype/desktop_settings/desktop_settings.json +++ b/frappe/desk/doctype/desktop_settings/desktop_settings.json @@ -7,9 +7,7 @@ "field_order": [ "icon_style", "navbar_style", - "show_app_icons_as_folder", - "sidebar_section", - "show_app_name_in_header" + "show_app_icons_as_folder" ], "fields": [ { @@ -25,17 +23,6 @@ "label": "Navbar Style", "options": "Awesomebar\nmacOS Launchpad\nBrand Logo\nBrand Logo with Search\nTimeless Launchpad\nApps with Search" }, - { - "fieldname": "sidebar_section", - "fieldtype": "Section Break", - "label": "Sidebar" - }, - { - "fieldname": "show_app_name_in_header", - "fieldtype": "Select", - "label": "Show App Name in Header", - "options": "Default\nTitle\nSubtitle" - }, { "default": "0", "fieldname": "show_app_icons_as_folder", @@ -47,7 +34,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-11-11 00:23:53.552669", + "modified": "2025-11-15 11:38:34.968344", "modified_by": "Administrator", "module": "Desk", "name": "Desktop Settings", diff --git a/frappe/desk/doctype/desktop_settings/desktop_settings.py b/frappe/desk/doctype/desktop_settings/desktop_settings.py index 5c1bc3c5f9..920fc06129 100644 --- a/frappe/desk/doctype/desktop_settings/desktop_settings.py +++ b/frappe/desk/doctype/desktop_settings/desktop_settings.py @@ -24,7 +24,6 @@ class DesktopSettings(Document): "Apps with Search", ] show_app_icons_as_folder: DF.Check - show_app_name_in_header: DF.Literal["Default", "Title", "Subtitle"] # end: auto-generated types pass diff --git a/frappe/desk/page/desktop/desktop.css b/frappe/desk/page/desktop/desktop.css index e67224ce75..727c586d04 100644 --- a/frappe/desk/page/desktop/desktop.css +++ b/frappe/desk/page/desktop/desktop.css @@ -3,6 +3,7 @@ --desktop-modal-width: 508px; --desktop-modal-height: 448px; --folder-thumbnail-icon-height: 12px; + --desktop-icon-dimension: 54px; } .desktop-wrapper{ max-width: 100%; @@ -74,8 +75,8 @@ background-color: unset; } .icon-container img{ - width: 54px; - height: 54px; + width: var(--desktop-icon-dimension); + height: var(--desktop-icon-dimension); } .icon-container{ padding: 10px; @@ -83,8 +84,8 @@ display: flex; align-items: center; justify-content: center; - width: 54px; - height: 54px; + width: var(--desktop-icon-dimension); + height: var(--desktop-icon-dimension); } .icon-container:has(.icon){ background-color: var(--surface-gray-3); @@ -145,11 +146,13 @@ .desktop-modal-body { width: var(--desktop-modal-width); - height: var(--desktop-modal-height); padding: 23px 0px 23px 0px !important; & .icons{ gap: 0px 0px; } + .icon-container{ + min-height: var(--desktop-icon-dimension); + } } .modal-heading{ display: flex;