diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-28 21:19:28 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-28 21:19:28 -0700 |
| commit | 090dae46e500634cec8f3718fbb83d5dbb8f9690 (patch) | |
| tree | 95913867ef065ecc3106a58ad3a773a93f84d500 | |
| parent | de13497333c9b68e3fa2d73c9a0284da7797f405 (diff) | |
| parent | bad22498bccc1f5fd21bad4ccb5b0e06b77160c6 (diff) | |
| download | volse-hubzilla-090dae46e500634cec8f3718fbb83d5dbb8f9690.tar.gz volse-hubzilla-090dae46e500634cec8f3718fbb83d5dbb8f9690.tar.bz2 volse-hubzilla-090dae46e500634cec8f3718fbb83d5dbb8f9690.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
| -rw-r--r-- | mod/tagger.php | 4 | ||||
| -rw-r--r-- | view/css/mod_directory.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mod/tagger.php b/mod/tagger.php index aafad58cf..f411bd6d5 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -48,7 +48,7 @@ function tagger_content(&$a) { break; default: $targettype = ACTIVITY_OBJ_NOTE; - $post_type = t('status'); + $post_type = t('post'); if($item['mid'] != $item['parent_mid']) $post_type = t('comment'); break; @@ -133,4 +133,4 @@ function tagger_content(&$a) { killme(); -}
\ No newline at end of file +} diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index d3831e589..8e55ac3be 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -10,11 +10,13 @@ .contact-photo-wrapper { display: table-cell; + table-layout: fixed; vertical-align: top; } .contact-info { display: table-cell; + table-layout: fixed; vertical-align: top; padding-left: 10px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e53cc7ee1..540f691c6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1326,6 +1326,7 @@ header { .contactname { padding-top: 2px; font-weight: bold; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: block; @@ -1408,7 +1409,6 @@ header { .acl-list-item p { font-size: $font_size; margin: 0px; - overflow: ellipsis; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -1870,6 +1870,9 @@ nav .dropdown-menu { .section-subtitle-wrapper h3 { margin-top: 0px; margin-bottom: 0px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .section-subtitle-wrapper { @@ -2000,6 +2003,7 @@ nav .badge.mail-update:hover { .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; + max-width: 100%; } .dropdown-menu img { |