diff options
| author | friendica <info@friendica.com> | 2014-04-15 18:36:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-15 18:36:05 -0700 |
| commit | e0cccb4cc2adf0a2d954295e9f03604428c2926a (patch) | |
| tree | b73f8999f54503ff57e99327fa437c11eee7270d | |
| parent | 1eb8e570bf3ac3e2fd8e84ba4ebdffd1c864a3e0 (diff) | |
| parent | efe80bb8e98b32b95d1380633e9ffd834fa82511 (diff) | |
| download | volse-hubzilla-e0cccb4cc2adf0a2d954295e9f03604428c2926a.tar.gz volse-hubzilla-e0cccb4cc2adf0a2d954295e9f03604428c2926a.tar.bz2 volse-hubzilla-e0cccb4cc2adf0a2d954295e9f03604428c2926a.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 6fbc86df6..ae4e48315 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -82,7 +82,7 @@ .wall-item-info { display: block; float: left; - margin-right: 20px; + margin-right: 10px; } .wallwall .wwto { @@ -272,7 +272,7 @@ } .comment-edit-photo { - margin: 10px 20px 10px 10px; + margin: 10px; float: left; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 321baecf0..f1bfbd711 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2239,18 +2239,10 @@ blockquote { margin-left: 24px; } - .wall-item-info { - margin-right: 10px; - } - .hide-comments-outer { margin-left: 24px; } - .comment-edit-photo { - margin: 10px; - } - .wall-item-photo { width: 48px !important; height: 48px !important; |