From efb60e603cb8a76f96f5f5ff491af7e1b46f1bf0 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 17:47:17 -0500
Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:

* master:

From 58cdf776b6f4e5f423c9ad05a5731314f64198c4 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 22:16:10 -0500
Subject: [PATCH 2/2] more ui thingies with dispy - we'll get you well dispy,
 we promise

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/style.css | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 23f0539d0..476ba59e9 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -153,7 +153,7 @@ a:hover {
     color: #729fcf;
 }
 input[type=submit] {
-    margin-top: 20px;
+    margin-top: 10px;
     height: 22px;
     background-color: #555753;
     color: #eeeeec;
@@ -1751,6 +1751,14 @@ div[id$="wrapper"] br {
 /**
  * 	contacts selector
  */
+.group-delete-wrapper {
+	margin: -28px 150px 0 0;
+    float: right;
+}
+#group-edit-submit-wrapper {
+    margin: 0 0 10px 0;
+    display: inline;
+}
 #group-edit-desc {
     margin: 10px 0px;
 }
@@ -2081,19 +2089,29 @@ div[id$="wrapper"] br {
  * Form fields
  */
 .field {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
+	/*margin-bottom: 10px;*/
+	/*padding-bottom: 10px;*/
     overflow: auto;
     width: 100%;
 }
 .field label {
     float: left;
     width: 200px;
+	display: block;
+	font-size: 1.077em;
+	margin-bottom: 0.2em;
+	margin: 0 10px 0.2em 0;
+	border: 1px #999 solid;
+	padding: 5px;
+	vertical-align: middle;
+}
+.field input {
+	width: 250px;
+	height: 25px;
+	border: 1px #666 solid;
 }
-
-.field input,
 .field textarea {
-    width: 400px;
+    width: 80%;
 }
 .field textarea {
     height: 100px;