Merge branch 'pu/cw/tablerIcons' into 'main'

feature(Tinebase): use tabler icons See merge request tine20/tine20!6559
tine-groupware · Feb 7, 2025 · 4f72c34 · 4f72c34
2 parents 0483c94 + aba7ac0
commit 4f72c34
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/tine20/Purchasing/images/purchasing.svg b/tine20/Purchasing/images/purchasing.svg
diff --git a/tine20/Purchasing/styles/purchasing.less b/tine20/Purchasing/styles/purchasing.less
@@ -1,3 +1,4 @@
 .PurchasingIconCls {
-  background-image:url(../images/purchasing.svg) !important;
+  background-image:url(../../Tinebase/js/node_modules/@tabler/icons/icons/outline/shopping-cart.svg) !important;
+  //background-image:url(../images/purchasing.svg) !important;
 }
diff --git a/tine20/Sales/css/Sales.css b/tine20/Sales/css/Sales.css
@@ -9,7 +9,7 @@
  */
 
 .SalesIconCls {
-    background-image:url(../../images/icon-set/icon_calculator.svg) !important;
+    background-image:url(../../Tinebase/js/node_modules/@tabler/icons/icons/outline/building-store.svg) !important;
 }
 
 .x-tree-node-icon.SalesContract, .SalesContract {

diff --git a/tine20/Tinebase/js/npm-shrinkwrap.json b/tine20/Tinebase/js/npm-shrinkwrap.json
diff --git a/tine20/Tinebase/js/package.json b/tine20/Tinebase/js/package.json
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.6",
+    "@tabler/icons": "^3.29.0",
     "@vueuse/core": "^10.3.0",
     "ace-builds": "^1.14.0",
     "async": "^3.2.4",