Fix layout after open the wallet. fix send button

This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-14 02:13:05 -03:00
parent d3107f2460
commit 959cd57fe1
5 changed files with 12 additions and 9 deletions

View File

@ -31,13 +31,13 @@
SupportedOrientations="Portrait" Orientation="Portrait" SupportedOrientations="Portrait" Orientation="Portrait"
shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480" shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480"
xmlns:my="clr-namespace:WPCordovaClassLib"> xmlns:my="clr-namespace:WPCordovaClassLib">
<Grid x:Name="LayoutRoot" Background="Transparent" HorizontalAlignment="Stretch"> <Grid x:Name="LayoutRoot" Background="Transparent">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<my:CordovaView <my:CordovaView
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Margin="0,0,0,0" Margin="1,0,0,0"
x:Name="CordovaView" x:Name="CordovaView"
VerticalAlignment="Stretch" /> VerticalAlignment="Stretch" />
</Grid> </Grid>

View File

@ -37,8 +37,7 @@
<section <section
class="main-dark" ng-class="{'main': index.hasProfile, 'main-dark': !index.hasProfile, 'animation-left': index.swipeLeft,
ng-class="{'main': index.hasProfile, 'animation-left': index.swipeLeft,
'animation-right': index.swipeRight}" 'animation-right': index.swipeRight}"
ui-view="main"></section> ui-view="main"></section>
<div ui-view="menu"></div> <div ui-view="menu"></div>

View File

@ -26,7 +26,7 @@
</div> </div>
<div ng-show="!index.needsBackup || receive.skipBackup"> <div ng-show="!index.needsBackup || receive.skipBackup">
<div class="row" ng-show="receive.generatingAddress"> <div class="row m20t" ng-show="receive.generatingAddress">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="oh text-center"> <div class="oh text-center">
<span class="text-gray" translate>Generating a new address...</span> <span class="text-gray" translate>Generating a new address...</span>

View File

@ -137,15 +137,14 @@
<div class="row" ng-show="!send.onGoingProcess"> <div class="row" ng-show="!send.onGoingProcess">
<div class="large-6 medium-6 small-6 columns"> <div class="columns" ng-class="{'small-6 medium-6 large-6':(send._paypro || send.lockAddress)}">
<button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx" <button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx"
ng-style="{'background-color':index.backgroundColor}" translate> ng-style="{'background-color':index.backgroundColor}" translate>
Send Send
</button> </button>
</div> </div>
<div class="large-6 medium-6 small-6 columns"> <div class="large-6 medium-6 small-6 columns" ng-show="!send.blockUx && (send._paypro || send.lockAddress)">
<a ng-click="send.resetForm(sendForm)" class="button expand warning" <a ng-click="send.resetForm(sendForm)" class="button expand warning" translate>Cancel</a>
ng-show="(send._paypro || send.lockAddress) && !send.blockUx" translate>Cancel</a>
</div> </div>
</div> </div>
</form> </form>

View File

@ -175,6 +175,11 @@ _:-ms-fullscreen, :root .main {
height:100%; height:100%;
} }
.home-wallet {
height: 100%;
background-color: #fff;
}
.home-wallet .avatar-wallet { .home-wallet .avatar-wallet {
padding: 1.7rem 1rem; padding: 1.7rem 1rem;
width: 75px; width: 75px;