diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-29 15:38:17 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-29 15:38:17 -0700 |
| commit | d19ffc73c2d4701ba0c63924be13ad4b01c588c4 (patch) | |
| tree | 76f5d9dadd1c2ba7bad8ead5c3c9c30250fc4bdc | |
| parent | a23b612ae976258a7bbbb61c7cef12f1b3c64076 (diff) | |
| parent | 357f3784b590f43ec0968a4c713b0fca2ec26074 (diff) | |
Merge branch '0.8.x' into design_reset
* 0.8.x:
Using max-width:480px for settings_design_background-image image
Using role for admin indicator. Added margin-left.
| -rw-r--r-- | actions/groupmembers.php | 2 | ||||
| -rw-r--r-- | theme/base/css/display.css | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/actions/groupmembers.php b/actions/groupmembers.php index be7a9e81c..14256526a 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -172,7 +172,7 @@ class GroupMemberListItem extends ProfileListItem parent::showFullName(); if ($this->profile->isAdmin($this->group)) { $this->out->text(' '); - $this->out->element('span', 'admin_indicator', _('Admin')); + $this->out->element('span', 'role', _('Admin')); } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index eb9c4652f..d68523020 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -589,13 +589,14 @@ font-weight:normal; content: ")"; font-weight:normal; } - -.entity_profile dt { -display:none; -} +.entity_profile dt, .entity_profile h2 { display:none; } +.entity_profile .role { +margin-left:11px; +font-style:italic; +} /* entity_profile */ /*entity_actions*/ @@ -1269,6 +1270,10 @@ clear:both; margin-bottom:0; } +#form_settings_design #settings_design_background-image img { +max-width:480px; +} + #form_settings_design #settings_design_color .form_data, #form_settings_design #color-picker { float:left; @@ -1303,6 +1308,3 @@ display:none; .guide { clear:both; } -.admin_indicator { -font-style:italic; -}
\ No newline at end of file |