verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 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 +10 -26
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d69cbe0ad4 - Show all commits

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

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

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

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