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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2021-06-15 16:41:12 +02:00
parent 8aa3d269ea 2262f3e542
commit 8c1df0743d
6 changed files with 401 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/core/components/table/style.scss
View File

@ -230,3 +230,7 @@ vn-table.scrollable.lg,
.vn-table.scrollable.lg {
max-height: 700px
}
.tableWrapper {
overflow-x: auto;
}

5
modules/entry/front/buy/index/index.html
View File

@ -10,6 +10,7 @@
</vn-watcher>
<div class="vn-w-xl">
<vn-card class="vn-pa-lg">
<div class="tableWrapper">
<vn-horizontal class="header">
<vn-tool-bar class="vn-mb-md">
<vn-button
@ -167,7 +168,7 @@
{{::buy.item.minPrice | currency: 'EUR':2}}
</span>
</td>
<td vn-fetched-tags colspan="9">
<td vn-fetched-tags colspan="8">
<vn-one title="{{::buy.item.name}}">{{::buy.item.name}}</vn-one>
<vn-fetched-tags
max-length="6"
@ -176,6 +177,7 @@
</vn-fetched-tags>
</td>
</tr>
<tr><td></td></tr>
</tbody>
</table>
<div>
@ -187,6 +189,7 @@
ng-click="model.insert({})">
</vn-icon-button>
</div>
</div>
</vn-card>
</div>
<div fixed-bottom-right>

19
modules/entry/front/buy/index/style.scss
View File

@ -8,14 +8,29 @@ vn-entry-buy-index vn-card {
background-color: lighten($color-marginal, 10%);
}
tbody tr:nth-child(1) {
border-top: 1px solid $color-marginal;
thead tr {
border-left: 1px solid white;
border-right: 1px solid white;
}
tbody tr:nth-child(1),
tbody tr:nth-child(2) {
border-left: 1px solid $color-marginal;
border-right: 1px solid $color-marginal;
}
tbody tr:nth-child(2) {
border-bottom: 1px solid $color-marginal;
}
tbody{
border-bottom: 1px solid $color-marginal;
}
tbody:last-child {
border-bottom: 0;
}
tbody tr:nth-child(3) {
height: inherit
}

1
modules/supplier/front/billing-data/index.html
View File

@ -49,6 +49,7 @@
rule>
</vn-input-number>
</vn-horizontal>
</vn-card>
<vn-button-bar>
<vn-submit
label="Save"

2
modules/ticket/front/component/index.html
View File

@ -8,6 +8,7 @@
</vn-crud-model>
<vn-data-viewer model="model" class="vn-w-xl">
<vn-card class="vn-mt-md">
<div class="tableWrapper">
<table class="vn-table">
<thead>
<tr>
@ -62,6 +63,7 @@
</tr>
</tbody>
</table>
</div>
</vn-card>
</vn-data-viewer>
<vn-side-menu side="right">