From 8116fc4f7ce1c3ee49c91eb0441122f0f18865d2 Mon Sep 17 00:00:00 2001
From: Melissa Wen <melissa.srw@gmail.com>
Date: Tue, 6 Oct 2015 13:10:29 -0300
Subject: [PATCH] fix manage users and roles pages on software panel

---
 src/noosfero-spb-theme/css/administration-panel.css | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/noosfero-spb-theme/css/administration-panel.css b/src/noosfero-spb-theme/css/administration-panel.css
index 0ce3edf..ddba458 100644
--- a/src/noosfero-spb-theme/css/administration-panel.css
+++ b/src/noosfero-spb-theme/css/administration-panel.css
@@ -290,6 +290,7 @@
   vertical-align: bottom;
 }
 
+<<<<<<< HEAD:src/noosfero-spb-theme/css/administration-panel.css
 /*Edition configuration profile */
 
 .action-profile_editor-edit #delete-profile{
@@ -310,4 +311,20 @@ border: 1px solid #ccc;
 border-radius: 4px;
 font-size: 15px;
 font-family: Arial, helvetica;
-}
\ No newline at end of file
+}
+
+/* Members management */
+.action-profile_members-index #members-list td{
+  padding-top: 5px; 
+}
+
+/*recover behavior of noosfero*/
+.action-profile_members-change_role .role-permissions{
+  margin: 12px 0;
+  padding-left: 40px;
+}
+
+/*recover behavior of noosfero*/
+.action-profile_members-change_role .role-permissions li{
+  list-style: square;
+}
--
libgit2 0.21.2