diff --git a/src/_h5ai/client/css/inc/preview.less b/src/_h5ai/client/css/inc/preview.less index f1b9957e..64f435bd 100644 --- a/src/_h5ai/client/css/inc/preview.less +++ b/src/_h5ai/client/css/inc/preview.less @@ -45,7 +45,7 @@ opacity: 0.5; } - &:hover, &.hover { + &:hover { img { background-color: rgba(27,27,27,0.8); opacity: 1; @@ -112,7 +112,7 @@ .bar-button { .bar-label; cursor: pointer; - &:hover, &.hover { + &:hover { .bar-highlight; } } diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less index 882c43e4..7a5130ec 100644 --- a/src/_h5ai/client/css/inc/sidebar.less +++ b/src/_h5ai/client/css/inc/sidebar.less @@ -66,7 +66,7 @@ overflow: hidden; outline: 0; - &:hover, &.hover { + &:hover { box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4); } } @@ -87,7 +87,7 @@ cursor: pointer; outline: 0; - &:hover, &.hover { + &:hover { box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4); } } diff --git a/src/_h5ai/client/css/inc/topbar.less b/src/_h5ai/client/css/inc/topbar.less index c21f8eb1..b5f5d5df 100644 --- a/src/_h5ai/client/css/inc/topbar.less +++ b/src/_h5ai/client/css/inc/topbar.less @@ -45,7 +45,7 @@ font-size: 15px; padding: 0 6px; - &:hover, &.hover { + &:hover { .topbar-hover; } } diff --git a/src/_h5ai/client/css/inc/tree.less b/src/_h5ai/client/css/inc/tree.less index 87b08ee3..0538abf7 100644 --- a/src/_h5ai/client/css/inc/tree.less +++ b/src/_h5ai/client/css/inc/tree.less @@ -19,7 +19,7 @@ text-decoration: none; color: @col; - &:hover, &.hover { + &:hover { color: @col-hover; } } diff --git a/src/_h5ai/client/css/inc/view.less b/src/_h5ai/client/css/inc/view.less index 976942a1..fa43e4b4 100644 --- a/src/_h5ai/client/css/inc/view.less +++ b/src/_h5ai/client/css/inc/view.less @@ -43,7 +43,7 @@ white-space: nowrap; background: #fff; - &:hover, &.hover { + &:hover { color: @item-col-hover; background: @item-background-col-hover; border-color: @item-border-col-hover; @@ -59,7 +59,7 @@ color: @item-col-sel; background: @item-background-col-sel; - &:hover, &.hover { + &:hover { color: @item-col-sel; background: @item-background-col-sel; } diff --git a/src/_h5ai/client/js/inc/ext/link-hover-states.js b/src/_h5ai/client/js/inc/ext/link-hover-states.js deleted file mode 100644 index 2316bbe6..00000000 --- a/src/_h5ai/client/js/inc/ext/link-hover-states.js +++ /dev/null @@ -1,51 +0,0 @@ -modulejs.define('ext/link-hover-states', ['_', '$', 'core/settings', 'core/event'], function (_, $, allsettings, event) { - - var settings = _.extend({ - enabled: false - }, allsettings['link-hover-states']); - var selector = "a[href^='/']"; - - - function selectLinks(href) { - - return $(_.filter($(selector), function (el) { - - return $(el).attr('href') === href; - })); - } - - function onMouseEnter() { - - var href = $(this).attr('href'); - - selectLinks(href).addClass('hover'); - } - - function onMouseLeave() { - - var href = $(this).attr('href'); - - selectLinks(href).removeClass('hover'); - } - - function onLocationChanged() { - - $('.hover').removeClass('hover'); - } - - function init() { - - if (!settings.enabled) { - return; - } - - $('body') - .on('mouseenter', selector, onMouseEnter) - .on('mouseleave', selector, onMouseLeave); - - event.sub('location.changed', onLocationChanged); - } - - - init(); -}); diff --git a/src/_h5ai/client/js/inc/ext/preview.js b/src/_h5ai/client/js/inc/ext/preview.js index 887b307b..6415ff07 100644 --- a/src/_h5ai/client/js/inc/ext/preview.js +++ b/src/_h5ai/client/js/inc/ext/preview.js @@ -122,7 +122,6 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor function onKeydown(ev) { var key = ev.which; - var delay = 300; if (key === 27) { // esc ev.preventDefault(); @@ -131,20 +130,14 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor } else if (key === 8 || key === 37) { // backspace, left ev.preventDefault(); ev.stopImmediatePropagation(); - $('#pv-bar-prev').addClass('hover'); - setTimeout(function () { $('#pv-bar-prev').removeClass('hover'); }, delay); onPrevious(); } else if (key === 13 || key === 32 || key === 39) { // enter, space, right ev.preventDefault(); ev.stopImmediatePropagation(); - $('#pv-bar-next').addClass('hover'); - setTimeout(function () { $('#pv-bar-next').removeClass('hover'); }, delay); onNext(); } else if (key === 70) { // f ev.preventDefault(); ev.stopImmediatePropagation(); - $('#pv-bar-fullscreen').addClass('hover'); - setTimeout(function () { $('#pv-bar-fullscreen').removeClass('hover'); }, delay); onFullscreen(); } } diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json index 94c64016..bd5341b6 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/conf/options.json @@ -163,13 +163,6 @@ Options "useBrowserLang": true }, - /* - Link the hover effects between crumb, main view and tree. - */ - "link-hover-states": { - "enabled": true - }, - /* Adds Piwik tracker javascript code.