Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0

This commit is contained in:
Jaime van Kessel 2018-11-30 15:34:47 +01:00
commit 384c359db1
9 changed files with 28 additions and 79 deletions

View file

@ -213,28 +213,6 @@ UM.Dialog
PropertyChanges { target: machineButton; opacity: 0; height: 0; }
}
transitions:
[
Transition
{
to: "collapsed";
SequentialAnimation
{
NumberAnimation { property: "opacity"; duration: 75; }
NumberAnimation { property: "height"; duration: 75; }
}
},
Transition
{
from: "collapsed";
SequentialAnimation
{
NumberAnimation { property: "height"; duration: 75; }
NumberAnimation { property: "opacity"; duration: 75; }
}
}
]
}
}
}