From 183202aeb3dbe825c7f9ef14d9fdce7ffaaa654a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 24 Apr 2015 02:17:54 -0300 Subject: [PATCH 1/2] Fix scroll for all pages --- public/views/add.html | 3 ++- public/views/backup.html | 2 +- public/views/copayers.html | 2 +- public/views/create.html | 2 +- public/views/import.html | 2 +- public/views/importLegacy.html | 2 +- public/views/join.html | 2 +- public/views/paymentUri.html | 2 +- public/views/preferences.html | 2 +- public/views/preferencesAltCurrency.html | 2 +- public/views/preferencesBwsUrl.html | 2 +- public/views/preferencesColor.html | 2 +- public/views/preferencesDeleteWallet.html | 2 +- public/views/preferencesLanguage.html | 2 +- public/views/preferencesUnit.html | 2 +- src/css/main.css | 12 ++++++++++++ src/css/mobile.css | 4 +++- 17 files changed, 31 insertions(+), 16 deletions(-) diff --git a/public/views/add.html b/public/views/add.html index c6285dc1a..3201a9753 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -1,3 +1,4 @@ +
-
+
diff --git a/public/views/backup.html b/public/views/backup.html index cdbba5b79..2ca89d3fc 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,5 +1,5 @@ -
+
diff --git a/public/views/copayers.html b/public/views/copayers.html index 808d59df5..a59570fe1 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,4 +1,4 @@ -
diff --git a/public/views/create.html b/public/views/create.html index a5e8b9c73..76f27020f 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -1,4 +1,4 @@ -
+
Creating wallet...
diff --git a/public/views/import.html b/public/views/import.html index 66f393e29..d573b622f 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -1,4 +1,4 @@ -
+
Importing wallet...
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html index 53c4f1384..063d2c3a3 100644 --- a/public/views/importLegacy.html +++ b/public/views/importLegacy.html @@ -1,4 +1,4 @@ -
+
diff --git a/public/views/join.html b/public/views/join.html index 0805cf020..8fa4db560 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,4 +1,4 @@ -
+
Joining shared wallet...
diff --git a/public/views/paymentUri.html b/public/views/paymentUri.html index 528000cb9..39ee15334 100644 --- a/public/views/paymentUri.html +++ b/public/views/paymentUri.html @@ -1,4 +1,4 @@ -
+

Bitcoin URI is NOT valid!

diff --git a/public/views/preferences.html b/public/views/preferences.html index 5c746f40c..75f6269a5 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,4 +1,4 @@ -
+

    {{index.walletName}} settings

    diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html index 83262b6bb..d105d4ba9 100644 --- a/public/views/preferencesAltCurrency.html +++ b/public/views/preferencesAltCurrency.html @@ -1,4 +1,4 @@ -
    +
    {{altCurrency.name}} diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index 9c6b2e63f..9d43fcde6 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index 3cca9b01b..7aa359333 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 04ac915e8..4a915228c 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -1,4 +1,4 @@ -
    +

    Warning!

    diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index 4bea5c75c..34bf47942 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -1,4 +1,4 @@ -
    +
    Applying changes
    +
    {{unit.shortName}} diff --git a/src/css/main.css b/src/css/main.css index a5161fe31..f08485974 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -145,6 +145,17 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu position: relative; } +.content { + -webkit-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0); + width:100%; + position: absolute; + top: 46px; + bottom: 0; + overflow: auto; +} + + .logo-setup { text-align: center; margin: 0 0 0.1rem 0; @@ -355,6 +366,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;} diff --git a/src/css/mobile.css b/src/css/mobile.css index 3bffe52c9..76a2b1c9e 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -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 { From fead9403a6d4c6ce6e527100b980b7a3ee883a92 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 24 Apr 2015 02:21:03 -0300 Subject: [PATCH 2/2] . --- src/css/main.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/css/main.css b/src/css/main.css index f08485974..c02510e19 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -146,8 +146,6 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu } .content { - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); width:100%; position: absolute; top: 46px;