GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-23 11:52:05 +01:00
commit 8638479cb6
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/grouplogo.php
View File

@ -182,7 +182,7 @@ class GrouplogoAction extends Action
$this->elementStart('form', array('enctype' => 'multipart/form-data', $this->elementStart('form', array('enctype' => 'multipart/form-data',
'method' => 'post', 'method' => 'post',
'id' => 'form_settings_logo', 'id' => 'form_settings_avatar',
'class' => 'form_settings', 'class' => 'form_settings',
'action' => 'action' =>
common_local_url('grouplogo', common_local_url('grouplogo',

8
theme/base/css/display.css
View File

@ -666,6 +666,8 @@ margin-bottom:0;
.section .entities li .fn { .section .entities li .fn {
display:none; display:none;
} }
.aside .section p,
.aside .section .more { .aside .section .more {
clear:both; clear:both;
} }
@ -944,6 +946,12 @@ padding-left:20px;
} }
.pagination {
float:left;
clear:both;
width:100%;
margin-top:18px;
}
.pagination dt { .pagination dt {
font-weight:bold; font-weight:bold;

4
theme/base/css/facebookapp.css Normal file
View File

@ -0,0 +1,4 @@
@import url("display.css");
@import url("../../identica/css/display.css");
span.facebook-button { border: 2px solid #777; padding: 5px; display: block; float: left; margin-right: 20px; -moz-border-radius: 4px; border-radius:4px; -webkit-border-radius:4px; font-weight: bold; background-color:#A9BF4F; color:#fff; font-size:1.2em }