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

232402_test_to_dev #1637

Merged
carlossa merged 27 commits from 232402_test_to_dev into dev 2023-06-26 10:10:54 +00:00
Conversation 0 Commits 27 Files Changed 22 +23 -7
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 544445c4ae - Show all commits

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

@ -16,9 +16,12 @@
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">
<h6 class="origin-info vn-my-md" ng-if="::$ctrl.logTree.length > 1"> <div class="origin-info vn-mb-md" ng-if="::$ctrl.logTree.length > 1">
<h6 class="origin-id">
{{::$ctrl.modelI18n}} #{{::originLog.originFk}} {{::$ctrl.modelI18n}} #{{::originLog.originFk}}
</h6> </h6>
<div class="line"></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">
<vn-avatar <vn-avatar

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

@ -6,10 +6,23 @@ vn-log {
margin-top: 0; margin-top: 0;
} }
& > .origin-info { & > .origin-info {
display: flex;
align-items: center;
margin-top: 28px;
gap: 6px;
& > .origin-id {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
color: $color-font-secondary; color: $color-font-secondary;
margin: 0;
}
& > .line {
flex-grow: 1;
background-color: $color-font-secondary;
height: 2px;
}
} }
} }
.user-log { .user-log {