harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css fixes - hopefully

Browse Source
This commit is contained in:
marijus 2015-01-20 22:19:51 +01:00
parent 5ee815b2fa
commit 43326a26b7
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
view/css/bootstrap-red.css vendored
View File

@ -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;
}

2
view/js/autocomplete.js
View File

@ -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>"

15
view/theme/redbasic/css/style.css
View File

@ -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;

2
view/tpl/hdr.tpl
View File

@ -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>