Skip to content

Commit

Permalink
Merge pull request #1419 from smeup/reltomaster
Browse files Browse the repository at this point in the history
up version 6.0.0
  • Loading branch information
lucafoscili authored Jun 20, 2022
2 parents ac8ea5e + f443ad8 commit 72003f0
Show file tree
Hide file tree
Showing 150 changed files with 29,867 additions and 32,511 deletions.
53,558 changes: 26,534 additions & 27,024 deletions packages/ketchup-showcase/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/ketchup-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"@sme.up/ketchup": "^5.2.0",
"@sme.up/ketchup": "^6.0.0",
"style-loader": "^0.23.1",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
Expand Down
14 changes: 0 additions & 14 deletions packages/ketchup-showcase/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,6 @@
-->
<!-- Versione jQuerySparkline 2.1.2 modificata per gestione shadow-dom -->
<script src="./js-temp/sparkline-tmp.js"></script>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script
async
src="https://www.googletagmanager.com/gtag/js?id=G-YLNKC0Q5X0"
></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag('js', new Date());

gtag('config', 'G-YLNKC0Q5X0');
</script>
</head>
<body>
<div id="app"></div>
Expand Down
20 changes: 15 additions & 5 deletions packages/ketchup-showcase/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@kup-tree-nodeselected="treeClick"
></kup-tree
><div class="version"
><a href="https://github.com/smeup/ketchup/releases/tag/v5.2.0"
>v5.2.0</a
><a href="https://github.com/smeup/ketchup/releases/tag/v6.0.0"
>v6.0.0</a
></div
></div
>
Expand Down Expand Up @@ -378,11 +378,11 @@ export default {
{
cells: {
ROUTE: {
value: 'tooltip',
value: 'imagelist',
},
},
icon: 'insert_comment',
value: 'Tooltip',
icon: 'photo_library',
value: 'Image list',
visible: true,
},
{
Expand Down Expand Up @@ -849,6 +849,16 @@ export default {
value: 'KupToolbar',
visible: false,
},
{
cells: {
ROUTE: {
value: 'kup-tooltip',
},
},
icon: 'insert_comment',
value: 'KupTooltip',
visible: false,
},
],
expandable: true,
icon: 'web',
Expand Down
Loading

0 comments on commit 72003f0

Please sign in to comment.