diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-22 12:14:45 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-22 12:14:45 -0700 |
| commit | 783f28c8b196bb22632c25f0007281be1449b0be (patch) | |
| tree | ea3abc075d3ccc9d75521ff6aedc4b011afe9795 | |
| parent | e292d8fb65305e4cffa3d0e15fefdcd5631bd24b (diff) | |
| parent | 3969870cf3878933f0c37c23e1d481d338b52d29 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
| -rw-r--r-- | actions/apioauthauthorize.php | 2 | ||||
| -rw-r--r-- | lib/action.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index 9929c36c0..b83582702 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -333,7 +333,7 @@ class ApiOauthAuthorizeAction extends Action parent::showStyleSheets(); if ($this->desktopMode()) { - $this->style('#wrap {min-width: 500px; } #content {width: 480px; padding: 10px;} fieldset {margin-bottom: 10px !important;}</style>'); + $this->style('#wrap {min-width: 500px;} #content {width: 480px; padding: 6px; margin: 4px 0px 0px 4px; border-top-left-radius: 7px; -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px;} fieldset {margin-bottom: 10px !important;}'); } } diff --git a/lib/action.php b/lib/action.php index 4aa6ace77..01bb0f7e9 100644 --- a/lib/action.php +++ b/lib/action.php @@ -364,7 +364,7 @@ class Action extends HTMLOutputter // lawsuit { $this->elementStart('body', (common_current_user()) ? array('id' => strtolower($this->trimmed('action')), 'class' => 'user_in') - : array('id' => $this->trimmed('action'))); + : array('id' => strtolower($this->trimmed('action')))); $this->elementStart('div', array('id' => 'wrap')); if (Event::handle('StartShowHeader', array($this))) { $this->showHeader(); |