diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-23 01:35:39 +0100 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-23 01:35:39 +0100 |
| commit | 8228dc7ed5de29d762b755ded7c7901390313e76 (patch) | |
| tree | dc23f91c617f3d1cd78155c1f0bbf65da779d450 | |
| parent | 0ecfd7a7ec5dd49fcb29ed09fd8ca945b178fbe8 (diff) | |
| parent | f3bbc9863b58c9a30d559bc423f693b774bdcc3b (diff) | |
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
| -rw-r--r-- | actions/showgroup.php | 4 | ||||
| -rw-r--r-- | lib/tagcloudsection.php | 5 | ||||
| -rw-r--r-- | theme/base/css/display.css | 30 |
3 files changed, 13 insertions, 26 deletions
diff --git a/actions/showgroup.php b/actions/showgroup.php index 6e2f939f9..8d8fbe6be 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -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'); } } diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php index 1a7f721b2..178dd88ca 100644 --- a/lib/tagcloudsection.php +++ b/lib/tagcloudsection.php @@ -116,4 +116,9 @@ class TagCloudSection extends Section { return common_local_url('tag', array('tag' => $tag)); } + + function divId() + { + return 'tagcloud'; + } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 596ce42f4..54a5b8833 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -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%; } -.notice div.entry-content a, -.notice .notice-options a, -.notice .notice-options input { - +#showstream .notice div.entry-content { +margin-left:0; } + .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 { -} - - - |