Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
This commit is contained in:
commit
8638479cb6
@ -182,7 +182,7 @@ class GrouplogoAction extends Action
|
||||
|
||||
$this->elementStart('form', array('enctype' => 'multipart/form-data',
|
||||
'method' => 'post',
|
||||
'id' => 'form_settings_logo',
|
||||
'id' => 'form_settings_avatar',
|
||||
'class' => 'form_settings',
|
||||
'action' =>
|
||||
common_local_url('grouplogo',
|
||||
|
@ -666,6 +666,8 @@ margin-bottom:0;
|
||||
.section .entities li .fn {
|
||||
display:none;
|
||||
}
|
||||
|
||||
.aside .section p,
|
||||
.aside .section .more {
|
||||
clear:both;
|
||||
}
|
||||
@ -944,6 +946,12 @@ padding-left:20px;
|
||||
}
|
||||
|
||||
|
||||
.pagination {
|
||||
float:left;
|
||||
clear:both;
|
||||
width:100%;
|
||||
margin-top:18px;
|
||||
}
|
||||
|
||||
.pagination dt {
|
||||
font-weight:bold;
|
||||
|
4
theme/base/css/facebookapp.css
Normal file
4
theme/base/css/facebookapp.css
Normal 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 }
|
Loading…
Reference in New Issue
Block a user