aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2013-12-03 14:00:46 +0100
committermarijus <mario@localhost.localdomain>2013-12-03 14:00:46 +0100
commitf49837d7ee16a7379eed40358ee099f137ce81ac (patch)
tree5d00640dd86d86db8ec1d384de5b6473a83a2846 /view
parentd525d1c26f2b67579ff5911dc81958c4fa1e9c6f (diff)
parentd96f5e2c081b582a77097b06706416d5ff371211 (diff)
downloadvolse-hubzilla-f49837d7ee16a7379eed40358ee099f137ce81ac.tar.gz
volse-hubzilla-f49837d7ee16a7379eed40358ee099f137ce81ac.tar.bz2
volse-hubzilla-f49837d7ee16a7379eed40358ee099f137ce81ac.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_connections.css2
-rw-r--r--view/theme/redbasic/css/style.css1
-rwxr-xr-xview/tpl/group_side.tpl5
3 files changed, 2 insertions, 6 deletions
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index c2f6eeff0..978d81bc1 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -3,7 +3,7 @@
color: #000;
}
.abook-them {
- margin-left: 225px;
+ margin-left: 375px;
margin-bottom: 15px;
}
.abook-me {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index cd0842683..33e89d3f2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1834,6 +1834,7 @@ a.mail-list-link {
border-radius: $radiuspx;
padding: 5px;
font-weight: bold;
+ clear: both;
}
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index ebc820530..d2d8a77e2 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -23,11 +23,6 @@
<div id="sidebar-new-group">
<a href="group/new">{{$createtext}}</a>
</div>
- {{if $ungrouped}}
- <div id="sidebar-ungrouped">
- <a href="nogroup">{{$ungrouped}}</a>
- </div>
- {{/if}}
</div>