Merge pull request #171 from cmgustavo/matias/bug/notif3-scroll

Matias/bug/notif3 scroll
This commit is contained in:
Matias Alejo Garcia 2015-04-24 02:18:47 -03:00
commit 7f92b4125b
17 changed files with 29 additions and 16 deletions

View File

@ -1,3 +1,4 @@
<div class="content">
<ul class="no-bullet manage size-12">
<li>
<a title="Create new wallet" ng-click="$root.go('create')">
@ -29,4 +30,4 @@
</li>
</ul>
<div class="extra-margin-bottom"></div>
</div>

View File

@ -1,5 +1,5 @@
<div class="backup" ng-controller="backupController as backup">
<div class="content p20v" ng-controller="backupController as backup">
<div class="row m20t">
<div class="columns" ng-show="!backup.backupWalletPlainText && !backup.error">
<div class="text-warning size-14 m10v" ng-show="backup.isEncrypted">

View File

@ -1,4 +1,4 @@
<div ng-controller="copayersController as copayers" ng-init="copayers.init()"
<div class="content p20v" ng-controller="copayersController as copayers" ng-init="copayers.init()"
ng-if="!index.clientError">
<div ng-show="!index.notAuthorized">

View File

@ -1,4 +1,4 @@
<div class="create m20t" ng-controller="createController as create">
<div class="content p20v" ng-controller="createController as create">
<div ng-show="create.loading" class="text-center text-gray animated infinite flash" translate>Creating wallet...</div>
<form name="setupForm" ng-submit="create.create(setupForm)" ng-show="!create.loading" novalidate>
<div class="row">

View File

@ -1,4 +1,4 @@
<div class="import m20t" ng-controller="importController as import">
<div class="content p20v" ng-controller="importController as import">
<div ng-show="import.loading" class="text-center text-gray animated infinite flash" translate>Importing wallet...</div>
<div class="row" ng-show="!import.loading">
<div class="large-12 columns">

View File

@ -1,4 +1,4 @@
<div class="import-profile" ng-controller="importLegacyController as importLegacy">
<div class="content p20v" ng-controller="importLegacyController as importLegacy">
<div class="row m20t">
<div class="large-5 large-centered medium-7 medium-centered columns">
<div class="logo-setup show-for-large-up">

View File

@ -1,4 +1,4 @@
<div class="join m20t" ng-controller="joinController as join">
<div class="content p20v" ng-controller="joinController as join">
<div ng-show="join.loading" class="text-center text-gray animated infinite flash" translate>Joining shared wallet...</div>
<div class="row" ng-show="!join.loading">
<div class="large-12 columns">

View File

@ -1,4 +1,4 @@
<div class="row m20t payment-uri" ng-controller="paymentUriController as payment">
<div class="content p20v row payment-uri" ng-controller="paymentUriController as payment">
<div class="large-12 columns" ng-init="uri = payment.checkBitcoinUri()">
<div class="panel text-center" ng-show="!uri">
<h1 translate>Bitcoin URI is NOT valid!</h1>

View File

@ -1,4 +1,4 @@
<div class="preferences" ng-controller="preferencesController as preferences">
<div class="content preferences" ng-controller="preferencesController as preferences">
<ul class="no-bullet m0 size-14">
<h4 class="title m0" translate>{{index.walletName}} settings</h4>

View File

@ -1,4 +1,4 @@
<div class="preferences" ng-controller="preferencesAltCurrencyController as prefAltCurrency">
<div class="content preferences" ng-controller="preferencesAltCurrencyController as prefAltCurrency">
<div ng-repeat="altCurrency in prefAltCurrency.alternativeOpts" ng-click="prefAltCurrency.save(altCurrency)" class="line-b p20 size-14">
<span>{{altCurrency.name}}</span>
<i class="fi-check size-16 right" ng-show="altCurrency.name == prefAltCurrency.selectedAlternative.name"></i>

View File

@ -1,4 +1,4 @@
<div class="preferences m20t columns" ng-controller="preferencesBwsUrlController as prefBwsUrl">
<div class="content preferences p20v columns" ng-controller="preferencesBwsUrlController as prefBwsUrl">
<form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="m20t">
<label>Bitcore Wallet Service URL</label>
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">

View File

@ -1,4 +1,4 @@
<div class="preferences" ng-controller="preferencesColorController as p">
<div class="content preferences" ng-controller="preferencesColorController as p">
<div ng-repeat="c in p.colorOpts" ng-click="p.save(c)" class="line-b p20 size-14">
<span ng-style="{'color': c}">&block;</span>
<i class="fi-check size-16 right" ng-show="p.color == c"></i>

View File

@ -1,4 +1,4 @@
<div class="m20t" ng-controller="preferencesDeleteWalletController as preferences">
<div class="content p20v" ng-controller="preferencesDeleteWalletController as preferences">
<h4 class="text-warning text-center m0" translate> Warning! </h4>
<div class="box-notification" ng-show="preferences.error" >
<span class="text-warning size-14">

View File

@ -1,4 +1,4 @@
<div class="preferences" ng-controller="preferencesLanguageController as prefLang">
<div class="content preferences" ng-controller="preferencesLanguageController as prefLang">
<div class="animated infinite flash text-center m20t text-gray" ng-show="prefLang.loading" translate>Applying changes</div>
<div ng-show="!prefLang.loading"
ng-repeat="lang in index.availableLanguages"

View File

@ -1,4 +1,4 @@
<div class="preferences" ng-controller="preferencesUnitController as prefUnit">
<div class="content preferences" ng-controller="preferencesUnitController as prefUnit">
<div ng-repeat="unit in prefUnit.unitOpts" ng-click="prefUnit.save(unit)" class="line-b p20 size-14">
<span>{{unit.shortName}}</span>
<i class="fi-check size-16 right" ng-show="prefUnit.unitName == unit.shortName"></i>

View File

@ -145,6 +145,15 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
position: relative;
}
.content {
width:100%;
position: absolute;
top: 46px;
bottom: 0;
overflow: auto;
}
.logo-setup {
text-align: center;
margin: 0 0 0.1rem 0;
@ -355,6 +364,7 @@ ul.manage li {
.p70l {padding-left: 70px;}
.p5h {padding: 0 5px;}
.p20h {padding: 0 20px;}
.p20v {padding: 20px 0;}
.p25l {padding-left: 25px;}
.p15 {padding:15px;}
.p20 {padding:20px;}

View File

@ -560,6 +560,7 @@ a.pin-button:active {
top: 0;
height: 100%;
overflow: auto;
padding-bottom: 20px;
}
.modal.fade,
@ -688,8 +689,9 @@ a.pin-button:active {
width:100%;
position: absolute;
top: 46px;
bottom: 80px;
bottom: 70px;
overflow: auto;
padding-bottom: 20px;
}
.tab-in {