summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/designsettings.php17
-rw-r--r--theme/base/css/display.css4
2 files changed, 13 insertions, 8 deletions
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 9650679ac..5def5053f 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -212,18 +212,19 @@ class DesignSettingsAction extends AccountSettingsAction
'maxlength' => '7',
'size' => '7',
'value' => '#' . $lcolor->hexValue()));
+ $this->elementEnd('li');
- $this->elementEnd('li');
+ } catch (WebColorException $e) {
+ common_log(LOG_ERR, 'Bad color values in design ID: ' .$design->id);
+ }
- } catch (WebColorException $e) {
- common_log(LOG_ERR, 'Bad color values in design ID: ' .
- $design->id);
- }
+ $this->elementEnd('ul');
+ $this->elementEnd('fieldset');
- $this->elementEnd('ul');
- $this->elementEnd('fieldset');
+ $this->submit('defaults', _('Use defaults'), 'submit form_action-default',
+ 'defaults', _('Restore default designs'));
- $this->element('input', array('id' => 'settings_design_reset',
+ $this->element('input', array('id' => 'settings_design_reset',
'type' => 'reset',
'value' => 'Reset',
'class' => 'submit form_action-primary',
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index df4e75633..eb9c4652f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -206,6 +206,10 @@ border-radius:4px;
padding:0 7px;
}
+.form_settings input.form_action-default {
+margin-right:11px;
+}
+.form_settings input.form_action-default,
.form_settings input.form_action-primary {
padding:0;
}