Merge branch 'pull'

This commit is contained in:
friendica 2012-03-24 02:32:15 -07:00
commit 72c2386edf
4 changed files with 4 additions and 4 deletions

View file

@ -7,7 +7,7 @@
{{ if $lastusers_title }}
<h3>Connectable Services</h3>
<div id="right_service_icons" style="margin-left: 10px; margin-top: 5px;">
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>

View file

@ -21,7 +21,7 @@ if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != ''
}
.wrap1 {
padding: 2px 5px;
background-color: #729FCF;
background-color: #000;
margin-bottom: 10px;
}
.wrap2 {

View file

@ -7,7 +7,7 @@
{{ if $lastusers_title }}
<h3>Connectable Services</h3>
<div id="right_service_icons" style="margin-left: 10px; margin-top: 5px;">
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>

View file

@ -21,7 +21,7 @@ if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != ''
}
.wrap1 {
padding: 2px 5px;
background-color: #729FCF;
background-color: #000;
margin-bottom: 10px;
}
.wrap2 {