diff --git a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js index 620ea6e6a9..56b4d18d62 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/shortcut.js +++ b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js @@ -59,8 +59,6 @@ export default class Shortcut extends Block { $(this.wrapper).find(".widget").addClass("shortcut edit-mode"); this.add_settings_button(); this.add_new_block_button(); - } else { - $(this.wrapper).append($(`
`)); } return this.wrapper; } diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 55b3554448..e160a8f080 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -98,14 +98,9 @@ export default class Widget { let base = this.title || this.label || this.name; let title = max_chars ? frappe.ellipsis(base, max_chars) : base; - if (this.icon) { - let icon = frappe.utils.icon(this.icon, "sm"); - this.title_field[0].innerHTML = `${icon} ${title}`; - } else { - this.title_field[0].innerHTML = `${title}`; - if (max_chars) { - this.title_field[0].setAttribute("title", this.title || this.label); - } + this.title_field[0].innerHTML = `${title}`; + if (max_chars) { + this.title_field[0].setAttribute("title", this.title || this.label); } this.subtitle && this.subtitle_field.html(this.subtitle); } diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index b4cf6926b1..d23a2032da 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -64,7 +64,7 @@ export default class LinksWidget extends Widget { return `${ item.label ? item.label : item.name - }`; + } ${frappe.utils.icon("es-line-arrow-up-right", "xs", "", "", "ml-2")} `; }; this.link_list = this.links.map((item) => { @@ -86,7 +86,6 @@ export default class LinksWidget extends Widget { } ${disabled_dependent(item)}" type="${item.type}" title="${ item.label ? item.label : item.name }"> - ${get_link_for_item(item)} `); }); diff --git a/frappe/public/js/frappe/widgets/quick_list_widget.js b/frappe/public/js/frappe/widgets/quick_list_widget.js index 05621aa995..e028d3e252 100644 --- a/frappe/public/js/frappe/widgets/quick_list_widget.js +++ b/frappe/public/js/frappe/widgets/quick_list_widget.js @@ -133,8 +133,6 @@ export default class QuickListWidget extends Widget { } setup_quick_list_item(doc) { - const indicator = frappe.get_indicator(doc, this.document_type); - let $quick_list_item = $(`
@@ -149,14 +147,6 @@ export default class QuickListWidget extends Widget {
`); - if (indicator) { - $(` -
- ${__(indicator[0])} -
- `).appendTo($quick_list_item); - } - $(`
${frappe.utils.icon("right", "xs")}
`).appendTo( $quick_list_item ); diff --git a/frappe/public/js/frappe/widgets/shortcut_widget.js b/frappe/public/js/frappe/widgets/shortcut_widget.js index 9c8bab8ef4..0a19862a8c 100644 --- a/frappe/public/js/frappe/widgets/shortcut_widget.js +++ b/frappe/public/js/frappe/widgets/shortcut_widget.js @@ -90,13 +90,14 @@ export default class ShortcutWidget extends Widget { }; this.action_area.empty(); - $(frappe.utils.icon("es-line-arrow-up-right", "xs", "", "", "ml-2")).appendTo( - this.action_area - ); const label = get_label(); let color = this.color && count ? this.color.toLowerCase() : "gray"; $( `
${label}
` ).appendTo(this.action_area); + + $(frappe.utils.icon("es-line-arrow-up-right", "xs", "", "", "ml-2")).appendTo( + this.action_area + ); } } diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index 5287428966..25e86dad47 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -133,7 +133,7 @@ body { } .widget-head { - @include flex(flex, space-between, center, null); + @include flex(flex, flex-start, center, null); .widget-label { min-width: 0px; @@ -347,9 +347,9 @@ body { &.onboarding-widget-box { margin-bottom: var(--margin-2xl); - padding: var(--padding-lg) !important; background-color: var(--bg-color); - border: 1px solid var(--border-color); + border-bottom: 1px solid var(--border-color); + border-radius: 0; &.edit-mode:hover { background-color: var(--bg-color); @@ -373,6 +373,7 @@ body { .widget-head { display: flex; + justify-content: space-between; .widget-label .widget-title { @include get_textstyle("lg", "semibold"); @@ -575,7 +576,6 @@ body { } padding: 10px; - border: 1px solid var(--border-color); .link-item { display: flex; @@ -588,19 +588,6 @@ body { border-radius: var(--border-radius-md); cursor: pointer; - .indicator-pill::before { - height: 4px; - width: 4px; - border-radius: var(--border-radius-lg); - } - - &:hover { - background-color: var(--fg-hover-color); - - .indicator-pill { - background-color: var(--fg-hover-color); - } - } &:first-child { margin-top: 12px; @@ -612,6 +599,9 @@ body { .link-content { flex: 1; + &:hover { + color: var(--gray-600); + } } .disabled-link { @@ -627,12 +617,6 @@ body { left: 20%; } } - - .indicator-pill { - margin-right: var(--margin-sm); - height: 20px; - padding: 3px 8px; - } } .widget-head .widget-label .widget-title { @@ -974,6 +958,7 @@ body { } .layout-main-section { + border: 1px solid var(--border-color); padding: var(--padding-md); margin-bottom: var(--margin-sm); @@ -1309,6 +1294,10 @@ body { &.edit-mode { padding: 7px 12px; + .widget-head { + justify-content: space-between; + } + &:hover { box-shadow: var(--shadow-base); background-color: var(--bg-color);