Merge bf17251 into f2e2de8

hacketyhack · Nov 17, 2013 · 1071001 · 1071001
2 parents f2e2de8 + bf17251
commit 1071001
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
@@ -20,4 +20,19 @@
       }
     }
   }
-}
+}
+
+.title {
+  display: inline;
+  margin-right: 10px;
+  margin: 0px;
+}
+
+#user-list {
+  li {
+    list-style-type: none;
+    padding-bottom: 3px;
+    padding-top: 3px;
+  }
+}
+
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -1,10 +1,8 @@
 =link_to "Create a diffusion", mailer_path(:user => User.all)
-%ul
+%ul#user-list
 	- @users.each do |user|
 		%li
-			.info
-				.title= user.username
-			.categories
-				.btn.success= link_to "Email him", mailer_path(:user => user)
+			.title= user.username
+			= link_to "Email him", mailer_path(:user => user), :class => "btn small info"
 
 = will_paginate @users