verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2023-06-25 20:00:02 +02:00
parent e32a29fc09 544445c4ae
commit 630ce40ef7
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -2,26 +2,26 @@
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;
margin-top: 28px;
gap: 6px;
& > .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;
margin: 0;
}
& > .line {
flex-grow: 1;
background-color: $color-font-secondary;
height: 2px;
}
}
}