From 0bbd4df64e62a7d79d10940d13a1597842ce6cac Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 목, 02 12월 2021 10:30:32 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/views/issue/issueDetail.html | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index 11d91da..e640537 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -86,7 +86,7 @@ <!-- �긽�꽭 �솕硫� --> <div class="support-ticket-content-w" ng-controller="issueDetailController"> <div class="support-ticket-content"> - <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }"> + <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }"> <span>�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span> </span> @@ -165,8 +165,8 @@ <div class="col-md-4"> <div class="form-group"> <label class="issue-detail-label"><span translate="common.importance">以묒슂�룄</span></label> - <label class="issue-detail-label offset-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label> - <label class="issue-detail-label offset-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label> + <label class="issue-detail-label offset-detail-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label> + <label class="issue-detail-label offset-detail-2"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label> <div class=""> <span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.severityVo.name}}"></span> @@ -274,7 +274,7 @@ </div>--> <hr> <!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>--> - + <div class="issue-detail-label"> <div ng-show="fn.containsPartner('�뾽泥�')" class="row"> <div class="col-sm-2"> <div class="form-group"> @@ -327,7 +327,8 @@ </div> </div> </div> - + </div> + <div class="issue-detail-label"> <div ng-show="fn.containsPartner('ISP');" class="row"> <div class="col-sm-2"> <div class="form-group"> @@ -387,7 +388,8 @@ </div> </div> </div> - + </div> + <div class="issue-detail-label"> <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row"> <div class="col-sm-2"> <div class="form-group"> @@ -448,8 +450,7 @@ </div> </div> </div> - - + </div> <div class="row mt-30"> <div class="col-md-10"> @@ -537,7 +538,7 @@ <h6 class="todo-content-subheader mt-30" translate="common.content">�궡�슜</h6> <div class="box mt-10 issue-detail-word-break width-100" > - <div ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div> + <div class="issue-detail-tab" ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div> <span class="fc-grey" ng-if="!$root.isDefined(vm.viewer.description)" translate="common.noContent"> �궡�슜�씠 �뾾�뒿�땲�떎. </span> -- Gitblit v1.8.0