summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-17 19:35:45 -0500
committerEvan Prodromou <evan@status.net>2009-11-17 19:35:45 -0500
commite3123be350f73e9a9698e864e4e94bb0b4dfe464 (patch)
tree204006c3ed3bcac5775cda497aad878eb3eb1e83
parentbcb49b00004e1f01c1096e42ba05f12951517891 (diff)
parent63ebb033bf5a991eefdfb0cfff25eed8629a9365 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
-rw-r--r--actions/designadminpanel.php2
-rw-r--r--lib/common.php3
-rw-r--r--theme/base/css/display.css16
3 files changed, 17 insertions, 4 deletions
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 024cbe251..dcf5605af 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -174,7 +174,7 @@ class DesignAdminPanelForm extends Form
$themes = array_combine($themes, $themes);
- $this->out->elementStart('ul');
+ $this->out->elementStart('ul', 'form_data');
$this->out->elementStart('li');
$this->out->dropdown('theme', _('Theme'),
diff --git a/lib/common.php b/lib/common.php
index 063d7d9d9..203b37c87 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -83,6 +83,9 @@ function _sn_to_path($sn)
return $p;
}
+// Save our sanity when code gets loaded through subroutines such as PHPUnit tests
+global $default, $config, $_server, $_path;
+
// try to figure out where we are. $server and $path
// can be set by including module, else we guess based
// on HTTP info.
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index a6a93c405..96e169d6d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -120,16 +120,21 @@ float:left;
.form_settings .form_data textarea,
.form_settings .form_data select,
.form_settings .form_data input {
-margin-left:11px;
+margin-left:1.795%;
float:left;
+width:39%;
+}
+.form_settings .form_data textarea {
+width:63%;
}
+
.form_settings .form_data input.submit {
margin-left:0;
}
.form_settings label {
margin-top:2px;
-width:152px;
+width:24%;
}
.form_actions label {
@@ -166,7 +171,7 @@ display:none;
.form_settings .form_data p.form_guide {
clear:both;
-margin-left:163px;
+margin-left:26%;
margin-bottom:0;
}
@@ -224,6 +229,10 @@ margin-left:29px;
#form_search .submit {
margin-left:11px;
}
+#form_search .form_data input {
+width:auto;
+}
+
address {
float:left;
@@ -1340,6 +1349,7 @@ display:block;
#settings_design_color .form_data .swatch {
padding:11px;
margin-left:0;
+width:auto;
}
.instructions ul {