diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
| commit | 5e1a9ad04d4e10ee44881a26ea72c9a80f748188 (patch) | |
| tree | 78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95 /plugins/Realtime | |
| parent | 817f01c3b18ec626701de2a1402562eeb87eee6d (diff) | |
| parent | ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 (diff) | |
Merge branch 'testing'
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'plugins/Realtime')
| -rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 2 | ||||
| -rw-r--r-- | plugins/Realtime/realtimeupdate.css | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 89640f5be..16e28e94d 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -87,7 +87,7 @@ class RealtimePlugin extends Plugin $scripts = $this->_getScripts(); foreach ($scripts as $script) { - $action->script($script); + $action->script(common_path($script)); } $user = common_current_user(); diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css index 56f869354..31e7c2ae6 100644 --- a/plugins/Realtime/realtimeupdate.css +++ b/plugins/Realtime/realtimeupdate.css @@ -18,7 +18,8 @@ display:none; } .realtime-popup #form_notice label[for=notice_data-attach], -.realtime-popup #form_notice #notice_data-attach { +.realtime-popup #form_notice #notice_data-attach, +.realtime-popup #form_notice label[for=notice_data-geo] { top:0; } |