verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 Releases Wiki Activity

refs #5816 Remove duplicated logs #1634

Merged
guillermo merged 14 commits from 5900-removeDuplicatedLogs into test 2023-06-29 13:35:50 +00:00
Conversation 0 Commits 14 Files Changed 32 +15 -15
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 630ce40ef7 - Show all commits

8
front/salix/components/log/index.html
View File

@ -16,11 +16,11 @@
model="model" model="model"
class="vn-w-sm vn-px-sm vn-pb-xl"> class="vn-w-sm vn-px-sm vn-pb-xl">
<div class="origin-log" ng-repeat="originLog in $ctrl.logTree"> <div class="origin-log" ng-repeat="originLog in $ctrl.logTree">
<div class="origin-info" ng-if="::$ctrl.logTree.length > 1"> <div class="origin-info vn-mb-md" ng-if="::$ctrl.logTree.length > 1">
<div class="line"></div> <h6 class="origin-id">
<div class="origin-id">
{{::$ctrl.modelI18n}} #{{::originLog.originFk}} {{::$ctrl.modelI18n}} #{{::originLog.originFk}}
</div> </h6>
<div class="line"></div>
</div> </div>
<div class="user-log vn-mb-sm" ng-repeat="userLog in ::originLog.logs"> <div class="user-log vn-mb-sm" ng-repeat="userLog in ::originLog.logs">
<div class="timeline"> <div class="timeline">

22
front/salix/components/log/style.scss
View File

@ -2,26 +2,26 @@
vn-log { vn-log {
.origin-log { .origin-log {
&:first-child > .origin-info {
margin-top: 0;
}
& > .origin-info { & > .origin-info {
display: flex; display: flex;
text-align: right;
justify-content: space-between;
align-items: center; align-items: center;
column-gap: 4px; margin-top: 28px;
padding-left: 48px; gap: 6px;
margin-bottom: 10px;
& > .line {
flex-grow: 1;
background-color: $color-font-secondary;
height: 2px;
}
& > .origin-id { & > .origin-id {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 1.1rem;
color: $color-font-secondary; color: $color-font-secondary;
margin: 0;
}
& > .line {
flex-grow: 1;
background-color: $color-font-secondary;
height: 2px;
} }
} }
} }