5 files changed, 56 insertions, 5 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 235c5604..be12af55 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -9,6 +9,8 @@
  *  4)  States and interactions
  *  5)  Positioning and order
  *  6)  Containers/widgets
+ *
+ *  @todo Remove extra white space at the top of the add comment form, above the first field
  */
 
 /** *******************************************************************
@@ -58,10 +60,6 @@ input[type="hidden"] {
   display: none;
 }
 
-textarea {
-  height: 12em;
-}
-
 input.textbox,
 input[type="text"],
 input[type="password"],
@@ -74,6 +72,11 @@ textarea {
   width: 50%;
 }
 
+textarea {
+  height: 12em;
+  width: 97%;
+}
+
 input:focus,
 input.textbox:focus,
 input[type=text]:focus,
diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css
new file mode 100644
index 00000000..d9d9b2f8
--- /dev/null
+++ b/modules/comment/css/comment.css
@@ -0,0 +1,35 @@
+#g-content #g-comment-form {
+  margin-top: 2em;
+}
+
+#g-content #g-comments {
+  margin-top: 2em;
+  position: relative;
+}
+
+#g-content #g-comments ul li {
+  margin: 1em 0;
+}
+
+#g-content #g-comments .g-author {
+  border-bottom: 1px solid #ccc;
+  color: #999;
+  height: 32px;
+  line-height: 32px;
+}
+
+#g-content #g-comments ul li div {
+  padding: 0 8px 8px 43px;
+}
+
+#g-content #g-comments .g-avatar {
+  height: 32px;
+  margin-right: .4em;
+  width: 32px;
+}
+
+#g-admin-comment-button {
+  position: absolute;
+  right: 0;
+  top: 2px;
+}
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 7b2332a8..bca19282 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -73,7 +73,7 @@ class comment_Core {
     $group->textarea("text")->label(t("Comment"))         ->id("g-text");
     $group->hidden("item_id")->value($item->id);
     module::event("comment_add_form", $form);
-    $group->submit("")->value(t("Add"));
+    $group->submit("")->value(t("Add"))->class("ui-state-default ui-corner-all");
 
     $active = user::active();
     if (!$active->guest) {
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index 10c855db..af0e1ca4 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,10 +19,16 @@
  */
 class comment_theme_Core {
   static function head($theme) {
+    $theme->css("comment.css");
     $theme->script("comment.js");
     return "";
   }
 
+  static function admin_head($theme) {
+    $theme->css("comment.css");
+    return "";
+  }
+
   static function photo_bottom($theme) {
     $block = new Block;
     $block->css_id = "g-comments";
diff --git a/modules/recaptcha/css/recaptcha.css b/modules/recaptcha/css/recaptcha.css
new file mode 100644
index 00000000..27117a55
--- /dev/null
+++ b/modules/recaptcha/css/recaptcha.css
@@ -0,0 +1,7 @@
+#g-content #g-comments ul li #g-recaptcha {
+  padding: 0;
+}
+
+#g-content #g-comments ul li #g-recaptcha div {
+  padding: 0;
+}