GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Evan Prodromou 2009-11-17 19:35:45 -05:00
parent bcb49b0000 63ebb033bf
commit e3123be350
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/designadminpanel.php
View File

@ -174,7 +174,7 @@ class DesignAdminPanelForm extends Form
$themes = array_combine($themes, $themes); $themes = array_combine($themes, $themes);
$this->out->elementStart('ul'); $this->out->elementStart('ul', 'form_data');
$this->out->elementStart('li'); $this->out->elementStart('li');
$this->out->dropdown('theme', _('Theme'), $this->out->dropdown('theme', _('Theme'),

3
lib/common.php
View File

@ -83,6 +83,9 @@ function _sn_to_path($sn)
return $p; 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 // try to figure out where we are. $server and $path
// can be set by including module, else we guess based // can be set by including module, else we guess based
// on HTTP info. // on HTTP info.

16
theme/base/css/display.css
View File

@ -120,16 +120,21 @@ float:left;
.form_settings .form_data textarea, .form_settings .form_data textarea,
.form_settings .form_data select, .form_settings .form_data select,
.form_settings .form_data input { .form_settings .form_data input {
margin-left:11px; margin-left:1.795%;
float:left; float:left;
width:39%;
} }
.form_settings .form_data textarea {
width:63%;
}
.form_settings .form_data input.submit { .form_settings .form_data input.submit {
margin-left:0; margin-left:0;
} }
.form_settings label { .form_settings label {
margin-top:2px; margin-top:2px;
width:152px; width:24%;
} }
.form_actions label { .form_actions label {
@ -166,7 +171,7 @@ display:none;
.form_settings .form_data p.form_guide { .form_settings .form_data p.form_guide {
clear:both; clear:both;
margin-left:163px; margin-left:26%;
margin-bottom:0; margin-bottom:0;
} }
@ -224,6 +229,10 @@ margin-left:29px;
#form_search .submit { #form_search .submit {
margin-left:11px; margin-left:11px;
} }
#form_search .form_data input {
width:auto;
}
address { address {
float:left; float:left;
@ -1340,6 +1349,7 @@ display:block;
#settings_design_color .form_data .swatch { #settings_design_color .form_data .swatch {
padding:11px; padding:11px;
margin-left:0; margin-left:0;
width:auto;
} }
.instructions ul { .instructions ul {