aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-12 16:16:14 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-12 16:16:14 -0700
commit42db2bc93d4ac0f90de1789fbf6df797c45b679e (patch)
tree7d75d1596d50fa5ba07cb9e931a52b0e9cabe964 /view/css
parenta2f5b55d10e5ed18494da99381874319c9a835d5 (diff)
parent43eefb5929ea81cbe3a4318eb8374151e3b9d9f2 (diff)
downloadvolse-hubzilla-42db2bc93d4ac0f90de1789fbf6df797c45b679e.tar.gz
volse-hubzilla-42db2bc93d4ac0f90de1789fbf6df797c45b679e.tar.bz2
volse-hubzilla-42db2bc93d4ac0f90de1789fbf6df797c45b679e.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/css')
-rw-r--r--view/css/conversation.css14
-rw-r--r--view/css/mod_directory.css3
2 files changed, 3 insertions, 14 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index e409cf4cf..9b659ea9f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -83,15 +83,6 @@ code {
margin-right: 10px;
}
-.wall-item-photo-wrapper {
- margin-top: 0px;
- margin-bottom: 20px;
-}
-
-.comment .wall-item-photo-wrapper {
- margin-bottom: 15px;
-}
-
.wall-item-wrapper {
margin-left:10px;
}
@@ -171,11 +162,6 @@ a.wall-item-name-link {
margin-top: 10px;
}
-.wall-item-tools {
- width: 100%;
- margin-top: 10px;
-}
-
.item-tool {
cursor: pointer;
}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 8e55ac3be..5a2b8d443 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -29,3 +29,6 @@
margin-top: -2px;
}
+.directory-collapse {
+ overflow: auto;
+}