From 376e755f722b0f902ceb4c8101e8c1bd80784b3e Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 31 Aug 2020 15:39:37 +0530 Subject: [PATCH 1/7] fix: list row head hover state --- frappe/public/scss/list.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/list.scss b/frappe/public/scss/list.scss index 712ad1ab05..51d950f515 100644 --- a/frappe/public/scss/list.scss +++ b/frappe/public/scss/list.scss @@ -65,7 +65,7 @@ body.no-list-sidebar { -webkit-transition: color 0.2s; font-size: var(--text-md); - &:hover { + &:hover:not(.list-row-head) { background-color: var(--highlight-color); } &:last-child { @@ -128,6 +128,7 @@ body.no-list-sidebar { } .list-row-head { + cursor: default; .list-subject { font-weight: normal; From 475b7a6877e58aea53f2bdb1c5ac0fe3cef24652 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 16:39:07 +0530 Subject: [PATCH 2/7] fix: lineheight for link field options --- frappe/public/scss/awesomebar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/scss/awesomebar.scss b/frappe/public/scss/awesomebar.scss index e131739593..7ad8f30ef2 100644 --- a/frappe/public/scss/awesomebar.scss +++ b/frappe/public/scss/awesomebar.scss @@ -56,6 +56,7 @@ p { margin: 3px 0; + line-height: 1.4; } } } \ No newline at end of file From 1f1f6e0b49362618e6cb9660c35a703680b1154a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 16:39:23 +0530 Subject: [PATCH 3/7] feat: override icon close fill globally --- frappe/public/scss/icons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/icons.scss b/frappe/public/scss/icons.scss index 604278a76b..5f2b1c8c1a 100644 --- a/frappe/public/scss/icons.scss +++ b/frappe/public/scss/icons.scss @@ -18,7 +18,7 @@ use.like-icon { } #icon-close { - fill: var(--icon-stroke); + fill: var(--gray-600); } .icon > .close-alt { From 17e41bf81f58d31cff777ea73c940081e1962535 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 16:39:48 +0530 Subject: [PATCH 4/7] feat: text muted for action items in timeline message --- frappe/public/scss/timeline.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/public/scss/timeline.scss b/frappe/public/scss/timeline.scss index a4d527bb41..ab98d831e3 100644 --- a/frappe/public/scss/timeline.scss +++ b/frappe/public/scss/timeline.scss @@ -98,6 +98,11 @@ $threshold: 40; overflow: scroll; max-height: 500px; } + + .actions > * { + color: var(--text-muted); + } + .action-btn { padding-top: 0; padding-bottom: 0; From 0fd7eef557682e532a9efabd19a1460da3c3f7ab Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 16:39:59 +0530 Subject: [PATCH 5/7] fix: layout for form scroll to top --- frappe/public/scss/form.scss | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/public/scss/form.scss b/frappe/public/scss/form.scss index ecd5d2c168..e1d51c65ea 100644 --- a/frappe/public/scss/form.scss +++ b/frappe/public/scss/form.scss @@ -258,8 +258,12 @@ margin-bottom: 0; } -.scroll-to-top { - position: absolute; - height: 28px; - right: 0; +.form-footer { + position: relative; + + .scroll-to-top { + position: absolute; + height: 28px; + right: 0; + } } \ No newline at end of file From 4cecb40fc48fec24b72fe8a7bec91c41b0e062e6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 17:01:07 +0530 Subject: [PATCH 6/7] feat: show only create button for null state in mobile --- frappe/public/js/frappe/list/list_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 39ffcb667c..87b50dabea 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -427,9 +427,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { "/assets/frappe/images/ui-states/list-empty-state.svg"; const new_button = this.can_create - ? `

` +

` : ""; return `
From 1f05e30cbfda3e5ddf0eda628375fa0ab1593aa6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 17:01:36 +0530 Subject: [PATCH 7/7] feat: hide primary button label in mobile if icon is present --- frappe/public/js/frappe/ui/page.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js index c64fbe0e5c..663e1841d4 100644 --- a/frappe/public/js/frappe/ui/page.js +++ b/frappe/public/js/frappe/ui/page.js @@ -157,7 +157,7 @@ frappe.ui.Page = Class.extend({ }, get_icon_label: function(icon, label) { - return `${icon ? frappe.utils.icon(icon, 'xs') : ''} ${__(label)} `; + return `${icon ? frappe.utils.icon(icon, 'xs') : ''} `; }, set_action: function(btn, opts) {