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

This commit is contained in:
Evan Prodromou 2009-01-23 01:35:39 +01:00
commit 8228dc7ed5
3 changed files with 13 additions and 26 deletions

View File

@ -351,7 +351,7 @@ class ShowgroupAction extends Action
return;
}
$this->elementStart('div', array('id' => 'entity_subscriptions',
$this->elementStart('div', array('id' => 'entity_members',
'class' => 'section'));
$this->element('h2', null, _('Members'));
@ -369,5 +369,7 @@ class ShowgroupAction extends Action
array('nickname' => $this->group->nickname))),
_('All members'));
}
$this->elementEnd('div');
}
}

View File

@ -116,4 +116,9 @@ class TagCloudSection extends Section
{
return common_local_url('tag', array('tag' => $tag));
}
function divId()
{
return 'tagcloud';
}
}

View File

@ -812,39 +812,27 @@ border-radius:4px;
}
.notice div.entry-content {
/*border:1px solid blue;*/
clear:left;
float:left;
/*width:48%;*/
font-size:0.95em;
margin-left:59px;
width:70%;
}
#showstream .notice div.entry-content {
margin-left:0;
}
.notice div.entry-content a,
.notice .notice-options a,
.notice .notice-options input {
}
.notice .notice-options a,
.notice .notice-options input {
float:left;
font-size:1.025em;
}
#laconicat .notice div.entry-content {
/*margin-left:0;*/
}
.notice div.entry-content dl,
.notice div.entry-content dt,
.notice div.entry-content dd {
display:inline;
}
.notice div.entry-content .timestamp {
margin-left:59px;
}
#showstream .notice div.entry-content .timestamp {
margin-left:0;
}
.notice div.entry-content .timestamp dt,
.notice div.entry-content .response dt {
@ -856,14 +844,6 @@ display:inline-block;
.notice div.entry-content .device dt {
text-transform:lowercase;
}
.notice div.entry-content a {
}
.notice div.entry-content a:hover {
}