Merge branch 'master' into talmdal_dev

3 files changed, 52 insertions, 1 deletions

diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css
new file mode 100644
index 00000000..f58391b0
--- /dev/null
+++ b/modules/comment/css/comment.css
@@ -0,0 +1,45 @@
+#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;
+}
+
+#g-admin-comments-menu {
+  margin: 1em 0;
+}
+
+#g-admin-comments-menu a {
+  margin: 0;
+  padding: .2em .6em;
+}
+
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 53d58afa..35685d8c 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 = identity::active_user();
     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";