diff options
| -rw-r--r-- | view/css/bootstrap-red.css | 8 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 5d9bb6e90..0c2d30284 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -38,13 +38,6 @@ nav .dropdown-menu .contactname { display: block; } -nav .dropdown-menu img { - float: left; - margin-right: 5px; - width: 32px; - height: 32px; -} - nav .dropdown-menu li a { overflow: hidden; text-overflow: ellipsis; @@ -67,6 +60,7 @@ nav .navbar-toggle { /* nav overrides end */ .dropdown-menu img { + float: left; width: 32px; height: 32px; margin-right: 5px; diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 50ba99279..2fcf7000b 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -56,7 +56,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick) if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "<div class='{0}' title='{4}'><img src='{1}'>{2}{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link) + return "<div class='{0}' title='{4}'><img src='{1}'><b>{2}</b><br>{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link) } else return "<div>"+item.text+"</div>" @@ -111,7 +111,7 @@ function submit_form(e) { replace: function(item) { return "$1"+item['text'] + ' '; }, } this.attr('autocomplete','off'); - this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1050}); + this.textcomplete([contacts,smilies],{className:'acpopup',zIndex:1020}); }; })( jQuery ); @@ -130,7 +130,7 @@ function submit_form(e) { template: contact_format, } this.attr('autocomplete','off'); - var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1050}); + var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100,zIndex: 1020,appendTo:'nav'}); a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); @@ -153,7 +153,7 @@ function submit_form(e) { } this.attr('autocomplete','off'); - var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1050}); + var a = this.textcomplete([contacts],{className:'acpopup',zIndex:1020}); if(autosubmit) a.on('textComplete:select', function(e,value,strategy) { submit_form(this); }); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c24bee1fd..3bb9fc72f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -874,6 +874,12 @@ footer { font-family: FontAwesome; } +nav .acpopup { + top: 49px !important; + right: 30px !important; + margin-left: -45px; +} + .profile-clear { clear: both; } |