From 62549a2d2d63e76eab0a96ca07df2a51e250991b Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 2 Feb 2016 16:18:15 +0100 Subject: [PATCH] textmodule: convert green highlight to blue highlight --- .../app/lib/base/jquery.textmodule.js | 26 +++++++++---------- app/assets/stylesheets/zammad.scss | 6 +---- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js index d9701ac2f..2fb8d0035 100644 --- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js +++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js @@ -54,7 +54,7 @@ // enter if ( e.keyCode === 13 ) { e.preventDefault() - var id = _this.$widget.find('.dropdown-menu li.active a').data('id') + var id = _this.$widget.find('.dropdown-menu li.is-active a').data('id') // as fallback use hovered element if (!id) { @@ -78,16 +78,16 @@ // up if ( e.keyCode === 38 ) { e.preventDefault() - if ( !_this.$widget.find('.dropdown-menu li.active')[0] ) { - var top = _this.$widget.find('.dropdown-menu li').last().addClass('active').position().top + if ( !_this.$widget.find('.dropdown-menu li.is-active')[0] ) { + var top = _this.$widget.find('.dropdown-menu li').last().addClass('is-active').position().top _this.$widget.find('.dropdown-menu').scrollTop( top ); return } else { - var prev = _this.$widget.find('.dropdown-menu li.active').removeClass('active').prev() + var prev = _this.$widget.find('.dropdown-menu li.is-active').removeClass('is-active').prev() var top = 300 if ( prev[0] ) { - top = prev.addClass('active').position().top + top = prev.addClass('is-active').position().top } _this.$widget.find('.dropdown-menu').scrollTop( top ); return @@ -97,16 +97,16 @@ // down if ( e.keyCode === 40 ) { e.preventDefault() - if ( !_this.$widget.find('.dropdown-menu li.active')[0] ) { - var top = _this.$widget.find('.dropdown-menu li').first().addClass('active').position().top + if ( !_this.$widget.find('.dropdown-menu li.is-active')[0] ) { + var top = _this.$widget.find('.dropdown-menu li').first().addClass('is-active').position().top _this.$widget.find('.dropdown-menu').scrollTop( top ); return } else { - var next = _this.$widget.find('.dropdown-menu li.active').removeClass('active').next() + var next = _this.$widget.find('.dropdown-menu li.is-active').removeClass('is-active').next() var top = 300 if ( next[0] ) { - top = next.addClass('active').position().top + top = next.addClass('is-active').position().top } _this.$widget.find('.dropdown-menu').scrollTop( top ); return @@ -384,13 +384,13 @@ template = template + "" var element = $(template) if (i == 0) { - element.addClass('active') + element.addClass('is-active') } this.$widget.find('ul').append(element) } - if ( !result[0] ) { - this.$widget.find('ul').append("
  • -
  • ") - } + // if ( !result[0] ) { + // this.$widget.find('ul').append("
  • -
  • ") + // } this.$widget.find('ul li').on( 'click', function(e) { diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 65a51fd04..70dcc187f 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -4417,14 +4417,10 @@ footer { justify-content: center; } -.shortcut .dropdown-menu > .active > a { +.shortcut .dropdown-menu > .is-active > a { background: none; } -.shortcut .dropdown-menu > .active { - background: hsl(145,51%,45%); -} - .editControls { position: absolute; left: 0;