diff options
| -rw-r--r-- | view/css/bootstrap-red.css | 20 | ||||
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 15 | ||||
| -rw-r--r-- | view/tpl/hdr.tpl | 2 |
4 files changed, 24 insertions, 15 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 5c9831907..a645b13d2 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -32,19 +32,6 @@ nav .dropdown-menu { margin-top: 0px; } -nav .dropdown-menu .contactname { - padding-top: 2px; - font-weight: bold; - display: block; -} - -nav .dropdown-menu li a { - overflow: hidden; - text-overflow: ellipsis; - //line-height: 1em; - padding: 5px 10px; -} - nav .navbar-collapse .navbar-left { float: left; } @@ -66,6 +53,13 @@ nav .navbar-toggle { margin-right: 5px; } +.dropdown-menu li a { + overflow: hidden; + text-overflow: ellipsis; + line-height: 1em; + padding: 5px 10px; +} + .nav-tabs.nav-justified > li { white-space: nowrap; } diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 0e2392976..1c524789d 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}'><b>{2}</b><br>{3}<div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link) + return "<div class='{0}' title='{4}'><img src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link) } else return "<div>"+item.text+"</div>" diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3bb9fc72f..ce933ba10 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1467,6 +1467,21 @@ header { padding: 7px 7px 0px 0px; } +.contactname { + padding-top: 2px; + font-weight: bold; + overflow: hidden; + text-overflow: ellipsis; + display: block; +} + +.dropdown-sub-text { + font-size: 0.833em; + overflow: hidden; + text-overflow: ellipsis; + display: block; +} + .notify-seen a { background: $notifyseen_bgcolour; color: $notifyseen_linkcolour !important; diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index fdcc4521c..cfd22e607 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class='contactname'>{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> </ul> |