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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-06-28 21:19:28 -07:00
commit 090dae46e5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/tagger.php
View File

@ -48,7 +48,7 @@ function tagger_content(&$a) {
break; break;
default: default:
$targettype = ACTIVITY_OBJ_NOTE; $targettype = ACTIVITY_OBJ_NOTE;
$post_type = t('status'); $post_type = t('post');
if($item['mid'] != $item['parent_mid']) if($item['mid'] != $item['parent_mid'])
$post_type = t('comment'); $post_type = t('comment');
break; break;

2
view/css/mod_directory.css
View File

@ -10,11 +10,13 @@
.contact-photo-wrapper { .contact-photo-wrapper {
display: table-cell; display: table-cell;
table-layout: fixed;
vertical-align: top; vertical-align: top;
} }
.contact-info { .contact-info {
display: table-cell; display: table-cell;
table-layout: fixed;
vertical-align: top; vertical-align: top;
padding-left: 10px; padding-left: 10px;
} }

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

@ -1326,6 +1326,7 @@ header {
.contactname { .contactname {
padding-top: 2px; padding-top: 2px;
font-weight: bold; font-weight: bold;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: block; display: block;
@ -1408,7 +1409,6 @@ header {
.acl-list-item p { .acl-list-item p {
font-size: $font_size; font-size: $font_size;
margin: 0px; margin: 0px;
overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -1870,6 +1870,9 @@ nav .dropdown-menu {
.section-subtitle-wrapper h3 { .section-subtitle-wrapper h3 {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.section-subtitle-wrapper { .section-subtitle-wrapper {
@ -2000,6 +2003,7 @@ nav .badge.mail-update:hover {
.dropdown-menu { .dropdown-menu {
font-size: $body_font_size; font-size: $body_font_size;
border-radius: $radiuspx; border-radius: $radiuspx;
max-width: 100%;
} }
.dropdown-menu img { .dropdown-menu img {