diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index f0adf8a41..78d9215f1 100644 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -555,4 +555,14 @@ html { .v-enter-from, .v-leave-to { opacity: 0; +} + +.height-enter-active, +.height-leave-active { + transition: height 0.3s ease-out; +} + +.height-enter-from, +.height-leave-to { + height: 0px; } \ No newline at end of file diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js index 717ac88f5..51bb6b4e1 100644 --- a/public/js/components/Cis/Menu.js +++ b/public/js/components/Cis/Menu.js @@ -88,7 +88,7 @@ export default { }); }, template: /*html*/` - diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js index 8546490e0..8bfd55908 100644 --- a/public/js/components/Dashboard/Item.js +++ b/public/js/components/Dashboard/Item.js @@ -1,9 +1,11 @@ import BsModal from "../Bootstrap/Modal.js"; import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js"; +import HeightTransition from "../Tranistion/HeightTransition.js"; export default { components: { BsModal, + HeightTransition }, data: () => ({ component: "", @@ -118,7 +120,9 @@ export default {
- + + + {{ widget.setup.name }} @@ -127,9 +131,11 @@ export default { -
- -
+ +
+ +
+
@@ -148,8 +154,10 @@ export default { - + + +
`, }; diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js index 06e8f535e..44ee91e23 100644 --- a/public/js/components/Drop/Grid.js +++ b/public/js/components/Drop/Grid.js @@ -356,29 +356,31 @@ export default { @drop="dragEnd" @mousemove="updateCursor" @mouseleave="mouseLeave"> - - - + + + + +
` } diff --git a/public/js/components/Tranistion/HeightTransition.js b/public/js/components/Tranistion/HeightTransition.js new file mode 100644 index 000000000..169f827f6 --- /dev/null +++ b/public/js/components/Tranistion/HeightTransition.js @@ -0,0 +1,24 @@ +export default { + data(){ + return { + + } + }, + methods:{ + onEnter(el,done){ + el.style.height = '0'; + el.style.height = el.scrollHeight + 'px'; + }, + onLeave(el,done){ + el.style.height = el.scrollHeight + 'px'; + el.style.height = '0'; + } + }, + template: + /*html*/` + + + + + `, +}; \ No newline at end of file