Fix comment textarea max-width. Fix display of extra rule description of an issue.

Conflicts:
	server/sonar-web/src/main/hbs/issue/issue-rule.hbs

diff --git a/server/sonar-web/src/main/hbs/issue/issue-rule.hbs b/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
index cee912e959437d713f5a321b5631b9dac37c9814..d613e6834edbd336320221e01f4ead367dd2ca5d 100644 (file)
--- a/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
+++ b/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
@@ -17,9 +17,14 @@
   {{/if}}
 </ul>
 
-
 <div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div>
 
+{{#if htmlNote}}
+  <div id="coding-rules-detail-description-extra">
+    <div class="rule-desc markdown">{{{htmlNote}}}</div>
+  </div>
+{{/if}}
+
 <div class="modal-foot">
   <a class="overlay-popup-close" title="{{t 'close'}}">{{t 'close'}}</a>
 </div>

diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less
index c28351bdd773a91999b9df89f7388de3009d4642..e7426cd0682ba01d6f102df35fcf2b2a580f1c4a 100644 (file)
--- a/server/sonar-web/src/main/less/components/issues.less
+++ b/server/sonar-web/src/main/less/components/issues.less
@@ -223,6 +223,7 @@ input.issue-action-options-search {
 
 .issue-comment-form-text textarea {
   width: 100%;
+  max-width: 100%;
 }
 
 .issue-comment-form-footer {