Merge pull request #1735 from bechi/new-style

fix animation style
This commit is contained in:
Matias Alejo Garcia 2014-11-08 10:06:21 -03:00
commit 5763002edd
2 changed files with 65 additions and 2 deletions

View File

@ -1116,7 +1116,7 @@ button.gray:focus,
transition: height 250ms ease-in;
}
.side-nav.wallets.open {
.side-nav.wallets.pullDown {
height: 100%;
}
@ -1417,6 +1417,69 @@ a.text-warning:hover {color: #FD7262;}
/* Animation popup */
.pullDown {
animation-name: pullDown;
-webkit-animation-name: pullDown;
animation-duration: 1.1s;
-webkit-animation-duration: 1.1s;
animation-timing-function: ease-out;
-webkit-animation-timing-function: ease-out;
transform-origin: 50% 0%;
-ms-transform-origin: 50% 0%;
-webkit-transform-origin: 50% 0%;
}
@keyframes pullDown {
0% {
transform: scaleY(0.1);
}
40% {
transform: scaleY(1.02);
}
60% {
transform: scaleY(0.98);
}
80% {
transform: scaleY(1.01);
}
100% {
transform: scaleY(0.98);
}
80% {
transform: scaleY(1.01);
}
100% {
transform: scaleY(1);
}
}
@-webkit-keyframes pullDown {
0% {
-webkit-transform: scaleY(0.1);
}
40% {
-webkit-transform: scaleY(1.02);
}
60% {
-webkit-transform: scaleY(0.98);
}
80% {
-webkit-transform: scaleY(1.01);
}
100% {
-webkit-transform: scaleY(0.98);
}
80% {
-webkit-transform: scaleY(1.01);
}
100% {
-webkit-transform: scaleY(1);
}
}
/*-----------------------------------------------------------------*/
.w-popup-menu{

View File

@ -46,7 +46,7 @@
</div>
<div>
<ul class="side-nav wallets" ng-class="{'open': walletSelection}" ng-show="wallets.0"
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets.0"
ng-class="{'large':wallets.length > 4, 'medium':wallets.length > 2 && wallets.length < 5}">
<li data-ng-repeat="item in wallets track by $index" class="nav-item" ng-if="item.id != $root.wallet.id" ng-click="switchWallet(item.id)">
<div class="col1">