fix merge issues. move user icons to the right.

This commit is contained in:
Luke Pulverenti 2013-03-30 11:04:59 -04:00
parent ee6f4f2b1e
commit 2b6b6d7db0
2 changed files with 8 additions and 6 deletions

View File

@ -33,7 +33,7 @@ body {
h1 {
font-family: 'Segoe UI Light', 'Open Sans', Arial, Helvetica, sans-serif;
font-weight: 200;
font-size: 32pt;
font-size: 28pt;
}
.toolsSidebar h1 {
@ -91,10 +91,6 @@ pre, textarea.pre {
background-attachment: fixed!important;
}
.ui-btn-icon-notext .ui-btn-inner .ui-icon {
margin: -10px -9px 0 0!important;
}
/*
Header
*/

View File

@ -38,10 +38,16 @@
html += "<h3>" + user.Name;
html += "</h3>";
html += "<p class='ui-li-aside'>";
if (user.Configuration.HasPassword) html += '<img src="css/images/userdata/password.png" alt="Password" title="Password" class="userProfileIcon" />';
if (user.Configuration.IsAdministrator) html += '<img src="css/images/userdata/administrator.png" alt="Administrator" title="Administrator" class="userProfileIcon" />';
html += "</h3></a>";
html += "</p>";
html += "</a>";
html += "<a onclick='UserProfilesPage.deleteUser(this);' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#'>Delete</a>";