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

textmodule: style keyboard shortcut

Browse source
This commit is contained in:
Felix Niklas 2016-02-02 16:59:58 +01:00
parent 3752e06d9b
commit e23a80f4cd
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,7 @@
// paste some content // paste some content
Plugin.prototype.paste = function(string) { Plugin.prototype.paste = function(string) {
string = App.Utils.text2html(string) + '<br>' string = App.Utils.text2html(string)
if (document.selection) { // IE if (document.selection) { // IE
var range = document.selection.createRange() var range = document.selection.createRange()
range.pasteHTML(string) range.pasteHTML(string)
@ -397,6 +397,9 @@
if (i == result.length-1) { if (i == result.length-1) {
element.addClass('is-active') element.addClass('is-active')
} }
if (item.keywords) {
element.append($('<kbd>').text(App.Utils.htmlEscape(item.keywords)))
}
this.$widget.find('ul').append(element) this.$widget.find('ul').append(element)
} }

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

@ -5486,6 +5486,16 @@ footer {
overflow: hidden; overflow: hidden;
} }
.dropdown-menu kbd {
background: none;
color: inherit;
padding: 2px 5px;
margin-left: 7px;
line-height: 1;
vertical-align: baseline;
opacity: 0.5;
}
.dropdown-toggle { .dropdown-toggle {
display: flex; display: flex;
align-items: center; align-items: center;