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

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.
This commit is contained in:
Zach Copley 2009-06-29 15:38:17 -07:00
parent a23b612ae9 357f3784b5
commit d19ffc73c2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/groupmembers.php
View File

@ -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'));
}
}

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

@ -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;
}