BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2769 from cmgustavo/bug/ux-anim-topbar 

Fixes animation, topbar and disables outline for modals
This commit is contained in:
Matias Alejo Garcia 2015-05-22 16:49:58 -03:00
parent 289d7843b3 4708f6b9c4
commit c3b1298bcf
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/views/modals/copayers.html
View File

@ -12,13 +12,13 @@
</section> </section>
</nav> </nav>
<ul class="no-bullet p60t"> <ul class="no-bullet p45t">
<li class="line-b p10" ng-repeat="copayer in copayers"> <li class="line-b p10" ng-repeat="copayer in copayers">
<span class="size-12" ng-show="copayer.id == copayerId"> <span class="size-12" ng-show="copayer.id == copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5r right"></i> <i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5 right"></i>
</span> </span>
<span class="size-12 text-gray" ng-show="copayer.id != copayerId"> <span class="size-12 text-gray" ng-show="copayer.id != copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5r right"></i> <i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5 right"></i>
</span> </span>
</li> </li>
</ul> </ul>

2
src/css/main.css
View File

@ -147,7 +147,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.content { .content {
width:100%; width:100%;
position: absolute; position: absolute;
top: 46px; top: 45px;
bottom: 0; bottom: 0;
overflow: auto; overflow: auto;
} }

9
src/css/mobile.css
View File

@ -90,12 +90,12 @@ _:-ms-fullscreen, :root .main {
.tab-bar { .tab-bar {
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 1px 1px 0px rgba(0,0,0,0.10);
display: block; display: block;
position: fixed; position: fixed;
width: 100%; width: 100%;
z-index: 5; z-index: 5;
line-height: 3.2rem; line-height: 3.2rem;
border-bottom: 1px solid #E9E9EC;
} }
.tab-bar h1 { .tab-bar h1 {
@ -410,8 +410,6 @@ to prevent collapsing during animation*/
} }
.CslideInUp { .CslideInUp {
transform: translate3d(0, 100%, 0);
-webkit-transform: translate3d(0, 100%, 0);
-webkit-animation-name: slideInUp; -webkit-animation-name: slideInUp;
animation-name: slideInUp; animation-name: slideInUp;
z-index: 1003; z-index: 1003;
@ -427,8 +425,6 @@ to prevent collapsing during animation*/
z-index: 1003; z-index: 1003;
} }
.CslideInRight { .CslideInRight {
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
-webkit-animation-name: slideInRight; -webkit-animation-name: slideInRight;
animation-name: slideInRight; animation-name: slideInRight;
z-index: 1003; z-index: 1003;
@ -572,6 +568,7 @@ to prevent collapsing during animation*/
border-radius: 0; border-radius: 0;
overflow-y: auto; overflow-y: auto;
padding-bottom: 20px; padding-bottom: 20px;
outline: 0;
} }
.reveal-modal.animated.slideInRight, .reveal-modal.animated.slideInRight,
@ -712,7 +709,7 @@ textarea:focus
transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
width:100%; width:100%;
position: absolute; position: absolute;
top: 46px; top: 45px;
bottom: 37px; bottom: 37px;
overflow: auto; overflow: auto;
padding-bottom: 40px; padding-bottom: 40px;