diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index 23a4739d54..354bf94150 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -44,16 +44,6 @@ details > summary:focus { color: @border-color !important; } -// transition -a, -.badge { - .transition(.2s); -} - -.btn { - .transition(background-color .2s); -} - a.disabled, a.disabled:hover { color: #888; diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index 9e276db2e6..7f4e40daf0 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -2,6 +2,21 @@ html { height: 100%; } +// transition +* { + transition: background-color 0.5s, background 0.5s; +} + +a, +.badge { + transition: 0.2s, +} + +.btn { + transition: background-color 0.2s, background 0.2s; +} + + body { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -264,26 +279,25 @@ select.input-xs { /* dropdowns */ -.dropdown-backdrop { - display: none; -} - .dropdown-item { border-radius: 4px; } .dropdown-menu { - min-width: 200px; padding: 4px; font-size: var(--text-md); max-height: 500px; overflow: auto; - color: $text-color; - border-radius: 6px; .dropdown-divider { margin: 4px 0; } + a:not([href]):hover:active { + color: $component-active-color ; + } + a { + cursor: pointer; + } } .dropdown-menu .divider { @@ -428,10 +442,10 @@ kbd { cursor: default; } -.dropdown-menu { - margin-top: var(--margin-xs); - box-shadow: var(--shadow-sm); -} +// .dropdown-menu { +// margin-top: var(--margin-xs); +// box-shadow: var(--shadow-sm); +// } .btn-link { box-shadow: none !important; diff --git a/frappe/public/scss/desk/variables.scss b/frappe/public/scss/desk/variables.scss index 9db007508d..5af3c33c68 100644 --- a/frappe/public/scss/desk/variables.scss +++ b/frappe/public/scss/desk/variables.scss @@ -2,10 +2,6 @@ html, body { font-size: 16px; } -* { - transition: background-color 0.5s, background 0.5s; -} - // colors $gray-900: #192734; $gray-800: #313B44; @@ -34,6 +30,8 @@ $border-radius: var(--border-radius); $border-radius-sm: var(--border-radius-sm); $border-radius-lg: var(--border-radius-lg); +$nav-divider-margin-y: 4px; + $container-max-widths: ( sm: 540px, md: 840px, @@ -69,6 +67,7 @@ $input-focus-border-color: var(--gray-500); $input-border-radius: var(--border-radius); // dropdown +$dropdown-color: var(--text-color); $dropdown-bg: var(--fg-color); $dropdown-border-color: var(--dark-border-color); $dropdown-link-color: var(--text-color); @@ -77,6 +76,7 @@ $dropdown-link-hover-bg: var(--fg-hover-color); $dropdown-link-disabled-color: var(--gray-600); $dropdown-header-color: var(--gray-600); $dropdown-divider-bg: var(--border-color); +$dropdown-min-width: 200px; // button $btn-padding-y-lg: 1rem !default;