mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 18:38:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:bitwarden/mobile

Browse source
This commit is contained in:
Kyle Spearrin 2017-12-06 11:31:54 -05:00
commit ce7bcfa666
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/App/Pages/LoginPage.cs
View file

@ -45,12 +45,12 @@ namespace Bit.App.Pages
var padding = Helpers.OnPlatform( var padding = Helpers.OnPlatform(
iOS: new Thickness(15, 20), iOS: new Thickness(15, 20),
Android: new Thickness(15, 8), Android: new Thickness(15, 8),
WinPhone: new Thickness(15, 20)); Windows: new Thickness(10, 8));
PasswordCell = new FormEntryCell(AppResources.MasterPassword, isPassword: true, PasswordCell = new FormEntryCell(AppResources.MasterPassword, isPassword: true,
useLabelAsPlaceholder: true, imageSource: "lock", containerPadding: padding); useLabelAsPlaceholder: true, imageSource: "lock.png", containerPadding: padding);
EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: PasswordCell.Entry, EmailCell = new FormEntryCell(AppResources.EmailAddress, nextElement: PasswordCell.Entry,
entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope", entryKeyboard: Keyboard.Email, useLabelAsPlaceholder: true, imageSource: "envelope.png",
containerPadding: padding); containerPadding: padding);
var lastLoginEmail = _settings.GetValueOrDefault(Constants.LastLoginEmail, string.Empty); var lastLoginEmail = _settings.GetValueOrDefault(Constants.LastLoginEmail, string.Empty);
@ -97,7 +97,7 @@ namespace Bit.App.Pages
var layout = new StackLayout var layout = new StackLayout
{ {
Children = { table, forgotPasswordButton }, Children = { table, forgotPasswordButton },
Spacing = Helpers.OnPlatform(iOS: 0, Android: 10, WinPhone: 0) Spacing = Helpers.OnPlatform(iOS: 0, Android: 10, Windows: 0)
}; };
var scrollView = new ScrollView { Content = layout }; var scrollView = new ScrollView { Content = layout };