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 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2022-01-14 10:08:01 +01:00
parent c90a2b6e5c 4aa6b2b6c0
commit 0d06ae309b
6 changed files with 4 additions and 20988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
front/core/styles/icons/salixfont.css
View File

@ -91,32 +91,26 @@
} }
.icon-calc_volum .path1:before { .icon-calc_volum .path1:before {
content: "\e915"; content: "\e915";
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path2:before { .icon-calc_volum .path2:before {
content: "\e916"; content: "\e916";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path3:before { .icon-calc_volum .path3:before {
content: "\e917"; content: "\e917";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path4:before { .icon-calc_volum .path4:before {
content: "\e918"; content: "\e918";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path5:before { .icon-calc_volum .path5:before {
content: "\e919"; content: "\e919";
margin-left: -1em; margin-left: -1em;
color: rgb(0, 0, 0);
} }
.icon-calc_volum .path6:before { .icon-calc_volum .path6:before {
content: "\e91a"; content: "\e91a";
margin-left: -1em; margin-left: -1em;
color: rgb(255, 255, 255);
} }
.icon-deliveryprices:before { .icon-deliveryprices:before {
content: "\e91c"; content: "\e91c";
@ -144,7 +138,6 @@
} }
.icon-invoice:before { .icon-invoice:before {
content: "\e924"; content: "\e924";
color: #5f5f5f;
} }
.icon-supplier:before { .icon-supplier:before {
content: "\e925"; content: "\e925";
@ -160,7 +153,6 @@
} }
.icon-shipment-01:before { .icon-shipment-01:before {
content: "\e929"; content: "\e929";
color: #000;
} }
.icon-inventory:before { .icon-inventory:before {
content: "\e92b"; content: "\e92b";
@ -398,7 +390,6 @@
} }
.icon-bucket:before { .icon-bucket:before {
content: "\e97a"; content: "\e97a";
color: #000;
} }
.icon-mandatory:before { .icon-mandatory:before {
content: "\e97b"; content: "\e97b";
@ -411,7 +402,6 @@
} }
.icon-invoices:before { .icon-invoices:before {
content: "\e97f"; content: "\e97f";
color: #000;
} }
.icon-grid:before { .icon-grid:before {
content: "\e980"; content: "\e980";

2
front/core/styles/text.scss
View File

@ -51,7 +51,7 @@ h1, h2, h3, h4, h5, h6 {
color: $color-main; color: $color-main;
} }
.text-secondary { .text-secondary {
color: $color-font-secondary; color: $color-font-light;
} }
/* Helpers */ /* Helpers */

2
modules/entry/front/buy/import/index.html
View File

@ -179,7 +179,7 @@
ng-click="$ctrl.selectItem(item.id)"> ng-click="$ctrl.selectItem(item.id)">
<vn-td shrink> <vn-td shrink>
<span <span
ng-click="itemDescriptor.show($event, item.id)" vn-click-stop="itemDescriptor.show($event, item.id)"
class="link"> class="link">
{{::item.id}} {{::item.id}}
</span> </span>

2
modules/item/front/basic-data/index.html
View File

@ -296,7 +296,7 @@
ng-click="$ctrl.selectItem(item.id)"> ng-click="$ctrl.selectItem(item.id)">
<vn-td shrink> <vn-td shrink>
<span <span
ng-click="itemDescriptor.show($event, item.id)" vn-click-stop="itemDescriptor.show($event, item.id)"
class="link"> class="link">
{{::item.id}} {{::item.id}}
</span> </span>

20974
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -9,7 +9,7 @@
"url": "https://gitea.verdnatura.es/verdnatura/salix" "url": "https://gitea.verdnatura.es/verdnatura/salix"
}, },
"engines": { "engines": {
"node": ">=12" "node": ">=14"
}, },
"dependencies": { "dependencies": {
"bmp-js": "^0.1.0", "bmp-js": "^0.1.0",