diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-29 18:01:51 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-29 18:01:51 -0700 |
| commit | 6e8ad5089e3aeea6377718db91ccf48284a315fa (patch) | |
| tree | 41cfeac8c0e80a135bdb10e9631519b8b2dd3225 /view | |
| parent | 63f2e9b41259975f1af6415cda01dc0f81b1af30 (diff) | |
| parent | 2072ea721fa26b8e5f7dd4067434951b738de92b (diff) | |
| download | volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.gz volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.bz2 volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
view/nl/messages.po
view/nl/strings.php
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 540f691c6..fcc089cf0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1559,6 +1559,11 @@ th,td { padding: 3px; } +#channels > tbody > tr > td, #users > tbody > tr > td { + max-width: 19.4em; + overflow: hidden; +} + /* message */ img.mail-list-sender-photo { @@ -2003,7 +2008,6 @@ nav .badge.mail-update:hover { .dropdown-menu { font-size: $body_font_size; border-radius: $radiuspx; - max-width: 100%; } .dropdown-menu img { diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index 98ec25e23..6407f1edd 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -41,9 +41,9 @@ </div> {{/if}} - {{if $entry.details}} + {{if $entry.location}} <div class="contact-info-element"> - <span class="contact-info-label">{{$entry.location}}</span> {{$entry.details}} + <span class="contact-info-label">{{$entry.location_label}}</span> {{$entry.location}} </div> {{/if}} |