aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-01-09 15:43:23 +0100
committerStas Vilchik <vilchiks@gmail.com>2015-01-09 15:44:53 +0100
commit6415792fef23efb180d8dd9be9c3cf51c1c23d4f (patch)
tree4eff9c23b019fa68f63988ec55f3ac40cab4c491 /server
parent34911bf5358b11a8828b4f34b83ab14d34b0326f (diff)
downloadsonarqube-6415792fef23efb180d8dd9be9c3cf51c1c23d4f.tar.gz
sonarqube-6415792fef23efb180d8dd9be9c3cf51c1c23d4f.zip
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
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/hbs/issue/issue-rule.hbs7
-rw-r--r--server/sonar-web/src/main/less/components/issues.less1
2 files changed, 7 insertions, 1 deletions
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 cee912e9594..d613e6834ed 100644
--- 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 c28351bdd77..e7426cd0682 100644
--- 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 {