From fcf231f13c43287d7cdf7e60d04c19f9257ceafd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 30 Nov 2020 13:39:15 +0530 Subject: [PATCH] fix: Awesomebar shadow --- .../js/frappe/ui/toolbar/awesome_bar.js | 2 +- frappe/public/scss/desk/awesomebar.scss | 22 ++++++++++--------- frappe/public/scss/desk/navbar.scss | 2 -- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js index 556e1fbb97..ab5434902b 100644 --- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js @@ -36,7 +36,7 @@ frappe.search.AwesomeBar = Class.extend({ } return $('
  • ') .data('item.autocomplete', d) - .html('

    ' + html + '

    ') + .html(`${html}`) .get(0); }, sort: function(a, b) { diff --git a/frappe/public/scss/desk/awesomebar.scss b/frappe/public/scss/desk/awesomebar.scss index 7ad8f30ef2..ef4bcf9c51 100644 --- a/frappe/public/scss/desk/awesomebar.scss +++ b/frappe/public/scss/desk/awesomebar.scss @@ -1,5 +1,6 @@ // REDESIGN-TODO: Review .awesomplete { + --awesomebar-shadow: 0px 2px 6px rgba(17, 43, 66, 0.08), 0px 1px 4px rgba(17, 43, 66, 0.1); [hidden] { display: none; } @@ -10,6 +11,12 @@ &> input { display: block; + &:focus { + // border-bottom: 1px solid var(--border-color); + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + box-shadow: var(--awesomebar-shadow); + } } &> ul:empty { @@ -25,19 +32,19 @@ overflow-y: auto; overflow-x: hidden; border-radius: var(--border-radius-sm); - box-shadow: var(--shadow-md); - border: 1px solid var(--border-color); + border-top-left-radius: 0; + border-top-right-radius: 0; left: 0; margin: 0; padding: var(--padding-xs); z-index: 1; - top: calc(100% + var(--margin-xs)); + box-shadow: var(--awesomebar-shadow); &> li { cursor: pointer; - font-size: 12px; + font-size: var(--text-md); padding: var(--padding-sm); - color: var(--text-light); + color: var(--text-color); border-radius: var(--border-radius-sm); } @@ -53,10 +60,5 @@ a:hover { text-decoration: none; } - - p { - margin: 3px 0; - line-height: 1.4; - } } } \ No newline at end of file diff --git a/frappe/public/scss/desk/navbar.scss b/frappe/public/scss/desk/navbar.scss index 56bf700985..facdd8cd05 100644 --- a/frappe/public/scss/desk/navbar.scss +++ b/frappe/public/scss/desk/navbar.scss @@ -61,8 +61,6 @@ font-size: var(--text-md); } input:focus { - box-shadow: 0px 1px 4px rgba(17, 43, 66, 0.1), - 0px 2px 6px rgba(17, 43, 66, 0.08); background-color: var(--awesomebar-focus-bg); height: 42px; }