Merge "adjusting the styles for the comment box (Bug #1037531)"

htdocs/theme/raw/static/style/views.css

@@ -158,6 +158,65 @@ ul.colnav li a:focus {
 .blockinstance-header .title a:active {
     text-decoration: none;
 }
+/******************** Block comment ********************/
+.blockinstance-content .comments {
+    border-top: 1px solid #EEEEEE;
+    background: #fbfbfb;
+    padding: 3px 7px;
+    line-height: 19px;
+    text-align: left;
+}
+.blockinstance-content .comments a {
+    line-height: 19px;
+    display: inline-block;
+}
+.blockinstance-content .comments .addcomment {
+    float: right;
+}
+.blockinstance-content .comments .nocomments {
+    text-align: left;
+}
+.blockinstance-content .feedbacktablewrapper {
+    display: none;
+    text-align: left;
+    background: #fbfbfb;
+    -webkit-border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+    padding: 5px 7px;
+}
+.blockinstance-content .feedbacktable .r0,
+.blockinstance-content .feedbacktable .r1 {
+    margin: 0 0 10px 0;
+}
+.blockinstance-content .feedbacktable .commentleft {
+    width: 25px;
+}
+.blockinstance-content .feedbacktable .commentleft img {
+    width: 25px;
+}
+.blockinstance-content .feedbacktable .commentrightwrap {
+    margin-left: 30px;
+    background: #FFFFFF;
+}
+.blockinstance-content .feedbacktable .undercomment {
+    margin-left: 35px;
+}
+.blockinstance-content .feedbacktablewrapper .close-link {
+    text-align: center;
+    padding: 3px 3px 3px 10px;
+    display: block;
+    background: #EEEEEE;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    font-size: 0.917em;
+}
+.blockinstance-content .feedbacktablewrapper .close-link:hover,
+.blockinstance-content .feedbacktablewrapper .close-link:focus {
+    background: #d5d5d5;
+    text-decoration: none;
+}
 /******************** Configure blockinstance ********************/
 .blockinstance.configure {
     border: 7px solid #EEEEEE;

htdocs/theme/views.css

@@ -101,13 +101,6 @@ ul.colnav li.selected span {
     padding: 8px 5px;
 }
 /* feedback */
-.feedbacktablewrapper {
-    margin-top: 5px;
-    border: 1px dotted #000;
-    padding: 4px;
-    display: none;
-    text-align: left;
-}
 .feedbacktable .r0,
 .feedbacktable .r1 {
     background: none;

htdocs/view/view.php

@@ -287,7 +287,7 @@ addLoadEvent(function () {
             var chtml = commentlink.parent().parent().find('#feedbacktable_' + blockid).parent();
             // add a 'close' link at the bottom of the list for convenience
             if (\$j('#closer_' + blockid).length == 0) {
-                var closer = \$j('<a id="closer_' + blockid + '" href="#">Close</a>').click(function(e) {
+                var closer = \$j('<a id="closer_' + blockid + '" href="#" class="close-link">Close</a>').click(function(e) {
                     \$j(this).parent().toggle(400, function() {
                         commentlink.focus();
                     });