aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-06 14:22:55 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-06 14:22:55 -0800
commita88ec1b1af954a447a666d3ff66b1d1df0a645db (patch)
tree7ccfe6a03923ad118910202e21a605e13127192c /view
parent553b3a5c6c2ba6b93ad1193ec044ee92cf7690aa (diff)
parenta6cb25020bb5200cc3c00ecc941ddb751644fbcc (diff)
downloadvolse-hubzilla-a88ec1b1af954a447a666d3ff66b1d1df0a645db.tar.gz
volse-hubzilla-a88ec1b1af954a447a666d3ff66b1d1df0a645db.tar.bz2
volse-hubzilla-a88ec1b1af954a447a666d3ff66b1d1df0a645db.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_directory.css4
-rw-r--r--view/theme/redbasic/css/style.css6
-rwxr-xr-xview/tpl/direntry.tpl2
3 files changed, 6 insertions, 6 deletions
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 5a2b8d443..9bfea856d 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -4,8 +4,8 @@
border: none;
}
-.directory-item {
- margin-bottom: 20px;
+.section-content-tools-wrapper {
+ padding-bottom: 20px;
}
.contact-photo-wrapper {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d76992b2f..a8b18a27e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1635,10 +1635,7 @@ img.mail-conv-sender-photo {
.divgrow-showmore {
display: block;
- width: 100%;
border-top: 1px dashed #ccc;
- border-bottom-right-radius: $radiuspx;
- border-bottom-left-radius: $radiuspx;
text-align: center;
font-size: $body_font_size;
color: $link_colour;
@@ -1649,6 +1646,9 @@ img.mail-conv-sender-photo {
border-top: 1px dashed #adadad;
}
+.directory-item .divgrow-showmore {
+ background-color: $comment_item_colour;
+}
/* widgets */
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 6407f1edd..ecc38beb9 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -14,7 +14,7 @@
</div>
<h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
</div>
- <div class="section-content-wrapper directory-collapse">
+ <div class="section-content-tools-wrapper directory-collapse">
<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >
<div class="contact-photo" id="directory-photo-{{$entry.hash}}" >
<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" >