From 09e38ddf95b509a85393884404ad2e4c65f1c134 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 금, 17 12월 2021 18:30:27 +0900 Subject: [PATCH] 히스토리 배치 수정 --- src/main/webapp/views/issue/issueDetail.html | 54 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index 6afd634..0aa3b15 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -635,7 +635,7 @@ <div class="col-sm-12"> <h6 class="todo-content-subheader mt-20" translate="common.writeComment">�뙎湲� �벐湲�</h6> <form name="commentForm" ng-enter="fn.addComment()"> - <div class="form-group row "> + <div class="form-group row mt-10"> <div class="col-sm-12"> <div class="input-group"> <input class="form-control" @@ -692,8 +692,8 @@ <div class="tab-content"> <!-- �쟾泥� 湲곕줉 蹂닿린 --> <div ng-if="vm.activeTab == 'ALL'"> - <div class="ae-item" ng-repeat="activeHistory in vm.viewer.activeHistory"> - <!-- 湲곕줉�씤 寃쎌슦 --> + <div class="ae-item row" ng-repeat="activeHistory in vm.viewer.activeHistory"> + <!-- 湲곕줉�씤 寃쎌슦 --> <div class="aei-content" ng-if="$root.isDefined(activeHistory.issueHistoryType)"> <!--<h6 ng-if="activeHistory.issueHistoryType == 'TOTAL'" @@ -704,21 +704,23 @@ <!-- �뙎湲��씤 寃쎌슦 --> <div ng-if="!$root.isDefined(activeHistory.issueHistoryType)" ng-show="vm.viewer.title !== activeHistory.title"> - <div> + <span class="dot"> �븯�쐞�씠�뒋 : {{::activeHistory.title}} - </div> + </span> </div> - <div class="aei-image" ng-if="!$root.isDefined(activeHistory.issueHistoryType)"> - <div class="user-avatar-w"> - <img alt="image" ng-src="{{::activeHistory.profile}}"> + <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(activeHistory.issueHistoryType)"> + <div class="user-avatar-w"> + <img alt="image" ng-src="{{::activeHistory.profile}}"> + </div> </div> - </div> + + <div class="aei-content" ng-if="!$root.isDefined(activeHistory.issueHistoryType)"> - <h6 class="aei-title"> + <h6 class="aei-title mt-1" style="margin-left: 3.3%"> {{::activeHistory.registerName}} </h6> - <div class="date-break"> + <div class="date-break mt-2" style="margin-left: 3.3%"> <span>{{::activeHistory.registerDate}}</span> </div> <div class="aei-delete" @@ -727,7 +729,7 @@ <i class="os-icon os-icon-close"></i> </div> <div class="chat-messages"> - <div class="message"> + <div class="message" style="margin-left: 3.3%"> <div class="message-content"> <span class="issue-detail-word-break">{{::activeHistory.description}}</span> </div> @@ -779,26 +781,26 @@ 湲곕줉�씠 �뾾�뒿�땲�떎. </div> - <div class="activity-item" ng-repeat="issueHistory in vm.viewer.activeParentHistory"> + <div class="ae-item row" ng-repeat="issueHistory in vm.viewer.activeParentHistory"> <!--<h6 ng-if="issueHistory.issueHistoryType == 'TOTAL'" translate="issue.summaryIssueActivity">�씠�뒋 �솢�룞 �궡�뿭 �슂�빟 <i class="os-icon os-icon-arrow-down"></i> </h6>--> - <div class="activity-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)"> + <div class="aei-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)"> <div dom-append dom="issueHistory.description"></div> </div> <!-- �뙎湲��씤 寃쎌슦 --> - <div class="aei-image" ng-if="!$root.isDefined(issueHistory.issueHistoryType)"> + <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(issueHistory.issueHistoryType)"> <div class="user-avatar-w"> <img alt="image" ng-src="{{::issueHistory.profile}}"> </div> </div> <div class="aei-content" ng-if="!$root.isDefined(issueHistory.issueHistoryType)"> - <h6 class="aei-title"> + <h6 class="aei-title mt-1" style="margin-left: 3.3%"> {{::issueHistory.registerName}} </h6> - <div class="date-break"> + <div class="date-break mt-2" style="margin-left: 3.3%"> <span>{{::issueHistory.registerDate}}</span> </div> <div class="aei-delete" @@ -807,7 +809,7 @@ <i class="os-icon os-icon-close"></i> </div> <div class="chat-messages"> - <div class="message"> + <div class="message" style="margin-left: 3.3%"> <div class="message-content"> <span class="issue-detail-word-break">{{::issueHistory.description}}</span> </div> @@ -821,27 +823,27 @@ <div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord"> 湲곕줉�씠 �뾾�뒿�땲�떎. </div> - <div class="activity-item" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory"> + <div class="ae-item row" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory"> <!-- 湲곕줉�씤 寃쎌슦 --> - <div class="activity-content" ng-if="$root.isDefined(issueDownHistory.issueHistoryType)"> + <div class="aei-content" ng-if="$root.isDefined(issueDownHistory.issueHistoryType)"> <div dom-append dom="issueDownHistory.description"></div> </div> <!-- �뙎湲��씤 寃쎌슦 --> <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)"> - <div class="aei-title"> + <div class="dot"> �븯�쐞�씠�뒋 : {{::issueDownHistory.title}} </div> </div> - <div class="aei-image" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)"> - <div class="user-avatar-w"> + <div class="aei-image" style="position: absolute; top: 30%" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)"> + <div class="user-avatar-w "> <img alt="image" ng-src="{{::issueDownHistory.profile}}"> </div> </div> <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)"> - <h6 class="aei-title"> + <h6 class="aei-title mt-1" style="margin-left: 3.3%"> {{::issueDownHistory.registerName}} </h6> - <div class="date-break"> + <div class="date-break mt-2" style="margin-left: 3.3%"> <span>{{::issueDownHistory.registerDate}}</span> </div> <div class="aei-delete" @@ -850,7 +852,7 @@ <i class="os-icon os-icon-close"></i> </div> <div class="chat-messages"> - <div class="message"> + <div class="message" style="margin-left: 3.3%"> <div class="message-content"> <span class="issue-detail-word-break">{{::issueDownHistory.description}}</span> </div> -- Gitblit v1.8.0