From 2b6b6d7db0f089d0dbd251b19e90ac324361a2c1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 30 Mar 2013 11:04:59 -0400
Subject: [PATCH] fix merge issues. move user icons to the right.

---
 dashboard-ui/css/site.css                | 6 +-----
 dashboard-ui/scripts/userprofilespage.js | 8 +++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index f3f44668d8..887db1a611 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -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
     */
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index 56295e9139..de7fa1010f 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -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>";