Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

textmodule: convert green highlight to blue highlight

Browse source
This commit is contained in:
Felix Niklas 2016-02-02 16:18:15 +01:00
parent 78548697eb
commit 62549a2d2d
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/assets/javascripts/app/lib/base/jquery.textmodule.js
View file

@ -54,7 +54,7 @@
// enter // enter
if ( e.keyCode === 13 ) { if ( e.keyCode === 13 ) {
e.preventDefault() 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 // as fallback use hovered element
if (!id) { if (!id) {
@ -78,16 +78,16 @@
// up // up
if ( e.keyCode === 38 ) { if ( e.keyCode === 38 ) {
e.preventDefault() e.preventDefault()
if ( !_this.$widget.find('.dropdown-menu li.active')[0] ) { if ( !_this.$widget.find('.dropdown-menu li.is-active')[0] ) {
var top = _this.$widget.find('.dropdown-menu li').last().addClass('active').position().top var top = _this.$widget.find('.dropdown-menu li').last().addClass('is-active').position().top
_this.$widget.find('.dropdown-menu').scrollTop( top ); _this.$widget.find('.dropdown-menu').scrollTop( top );
return return
} }
else { 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 var top = 300
if ( prev[0] ) { if ( prev[0] ) {
top = prev.addClass('active').position().top top = prev.addClass('is-active').position().top
} }
_this.$widget.find('.dropdown-menu').scrollTop( top ); _this.$widget.find('.dropdown-menu').scrollTop( top );
return return
@ -97,16 +97,16 @@
// down // down
if ( e.keyCode === 40 ) { if ( e.keyCode === 40 ) {
e.preventDefault() e.preventDefault()
if ( !_this.$widget.find('.dropdown-menu li.active')[0] ) { if ( !_this.$widget.find('.dropdown-menu li.is-active')[0] ) {
var top = _this.$widget.find('.dropdown-menu li').first().addClass('active').position().top var top = _this.$widget.find('.dropdown-menu li').first().addClass('is-active').position().top
_this.$widget.find('.dropdown-menu').scrollTop( top ); _this.$widget.find('.dropdown-menu').scrollTop( top );
return return
} }
else { 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 var top = 300
if ( next[0] ) { if ( next[0] ) {
top = next.addClass('active').position().top top = next.addClass('is-active').position().top
} }
_this.$widget.find('.dropdown-menu').scrollTop( top ); _this.$widget.find('.dropdown-menu').scrollTop( top );
return return
@ -384,13 +384,13 @@
template = template + "</a></li>" template = template + "</a></li>"
var element = $(template) var element = $(template)
if (i == 0) { if (i == 0) {
element.addClass('active') element.addClass('is-active')
} }
this.$widget.find('ul').append(element) this.$widget.find('ul').append(element)
} }
if ( !result[0] ) { // if ( !result[0] ) {
this.$widget.find('ul').append("<li><a href='#'>-</a></li>") // this.$widget.find('ul').append("<li><a href='#'>-</a></li>")
} // }
this.$widget.find('ul li').on( this.$widget.find('ul li').on(
'click', 'click',
function(e) { function(e) {

6
app/assets/stylesheets/zammad.scss
View file

@ -4417,14 +4417,10 @@ footer {
justify-content: center; justify-content: center;
} }
.shortcut .dropdown-menu > .active > a { .shortcut .dropdown-menu > .is-active > a {
background: none; background: none;
} }
.shortcut .dropdown-menu > .active {
background: hsl(145,51%,45%);
}
.editControls { .editControls {
position: absolute; position: absolute;
left: 0; left: 0;