fix layout for IE

This commit is contained in:
Gustavo Maximiliano Cortez 2015-01-15 17:16:51 -03:00
parent 1eaf39641f
commit 383f8001a0
17 changed files with 63 additions and 40 deletions

View File

@ -688,7 +688,6 @@ a.button-setup {
.locked {
font-size: 11px;
margin-top: 0.2rem;
color: #7A8C9E;
}

View File

@ -19,15 +19,30 @@
}
.page, .main {
height: auto;
height: 100%;
}
.main {
height: 92%;
margin-top: 30px;
margin-left: 0;
margin-bottom: -30px;
padding: 20px 0 80px 0;
padding: 60px 0 80px 0;
}
/* Fix IE */
.extra-margin-bottom {
display: block
height: 75px
overflow: hidden
clear: both
}
/* Fix Firefox */
@-moz-document url-prefix() {
.extra-margin-bottom {
display: block;
height: 75px;
overflow: hidden;
clear: both;
}
}
.tab-bar {

View File

@ -121,7 +121,9 @@
ng-class="{'dni':$root.hideNavigation || $root.wpInputFocused}"
></div>
<section ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation && !$root.wpInputFocused}" ng-view></section>
<section
ng-class="{'main':$root.iden && !$root.starting && !$root.hideNavigation && !$root.wpInputFocused}"
ng-view></section>
<a class="exit-off-canvas"></a>

View File

@ -18,4 +18,5 @@
<span>Import wallet</span>
</a>
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -1,7 +1,7 @@
<div ng-controller="CopayersController" ng-init="init()">
<div class="row">
<div class="large-12 medium-12 small-12 columns">
<h1 class="hide-for-large-up size-18">{{$root.title}}</h1>
<h1>Share this secret with your copayers</h1>
</div>
</div>
@ -50,4 +50,5 @@
</div>
<!-- end of row -->
</div>
<div class="extra-margin-bottom"></div>

View File

@ -87,3 +87,4 @@
</form>
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -241,4 +241,5 @@
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -8,4 +8,4 @@
<h3 translate class="text-center" ng-class="{'text-white': !$root.wallet}">Page not found</h3>
<p class="text-center"><a href="#!/">&laquo; <span translate>Back</span></a></p>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -47,7 +47,7 @@
</div>
</div>
</div>
<div class="m50b" ng-show="blockchain_txs[0].txid">
<div class="m10b" ng-show="blockchain_txs[0].txid">
<div class="row">
<div class="large-9 columns">
<pagination page="currentPage" total-items="totalItems" items-per-page="itemsPerPage" on-select-page="selectPage(page)" max-size="10" />
@ -67,3 +67,4 @@
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -85,9 +85,10 @@
</div>
</div>
<div class="row m50b" ng-show="isMobile">
<div class="row" ng-show="isMobile">
<div class="large-12 columns text-right size-12">
<a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -97,3 +97,4 @@
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -1,26 +1,21 @@
<div class="founds">
<span ng-if="!$root.wallet.isComplete()">Waiting for copayers...</span>
<div ng-if="$root.wallet.isComplete()">
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<div ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
<small class="db text-light">Balance:</small>
<b class="m5r">{{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}}</b>
<span ng-if="$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
<span ng-if="!$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">N/A</span>
<small ng-if="$root.wallet">
<a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance">
<i class="fi-refresh"></i>
</a>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
</small>
</div>
</div>
<div class="founds" ng-if="$root.wallet.isComplete()">
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<div ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance" data-options="disable_for_touch:true">
<small class="db text-light">Balance:</small>
<b class="m5r">{{$root.wallet.balanceInfo.totalBalance || 0}} {{$root.wallet.settings.unitName}}</b>
<span ng-if="$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">{{$root.wallet.balanceInfo.totalBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}</span>
<span ng-if="!$root.wallet.balanceInfo.alternativeBalanceAvailable" class="alt-currency gray">N/A</span>
<small ng-if="$root.wallet">
<a class="text-gray" ng-click="refresh()" ng-if="$root.wallet.isComplete() && !$root.updatingBalance">
<i class="fi-refresh"></i>
</a>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
</small>
</div>
</div>
<div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()" ng-init="init()" ng-click="hoverMenu = !hoverMenu">
<a class="dropdown ellipsis text-gray pr" ng-class="{'hover': hoverMenu}">
<div class="photo-container">

View File

@ -76,4 +76,5 @@
<!-- End !loading -->
</div>
<div class="extra-margin-bottom"></div>

View File

@ -102,3 +102,4 @@
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -103,7 +103,7 @@
<div class="line-dashed-h m20b"></div>
<div class="m50b row oh">
<div class="row oh">
<div class="large-12 columns">
<a class="small left button-setup" ng-click="hideAdv=!hideAdv">
<i class="fi-widget m3r"></i>
@ -116,7 +116,7 @@
</div>
</div>
<div ng-hide="hideAdv" class="row m50b">
<div ng-hide="hideAdv" class="row">
<div class="large-12 columns">
<div class="panel">
<h2><i class="fi-minus-circle m10r"></i>
@ -142,3 +142,4 @@
</div>
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -22,7 +22,7 @@
</div>
</div>
</div>
<div class="row m50b">
<div class="row">
<div class="large-12 columns" ng-if="showAll">
<div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
<div class="panel">
@ -64,3 +64,4 @@
</div>
</div>
<div class="extra-margin-bottom"></div>

View File

@ -164,19 +164,20 @@
</div>
</div>
</form>
<div class="locked" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
<i class="fi-lock"></i>
<span>
{{'Locked'|translate}} &nbsp;
{{'Locked'|translate}} &nbsp;
</span>
<span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
<span ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance">
<b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b>
- {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
</span>
<a href="#" class="has-tip" tooltip-placement="left" tooltip="More info"><i class="fi-info"></i></a>
</span>
</div>
</div>
</div>
<!-- end of row -->
</div>
<div class="extra-margin-bottom"></div>