diff --git a/Gruntfile.js b/Gruntfile.js index b007c8083..026c4d499 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -94,7 +94,7 @@ module.exports = function(grunt) { }, files: [{ expand: true, - src: ['src/sass/*.scss'], + src: ['src/sass/main.scss'], dest: './', ext: '.css' }] @@ -193,12 +193,6 @@ module.exports = function(grunt) { src: 'bower_components/ionic/release/js/ionic.bundle.min.js', dest: 'public/lib/' }, - ionic_css: { - expand: true, - flatten: true, - src: 'bower_components/ionic/release/css/ionic.min.css', - dest: 'public/css/' - }, linux: { files: [{ expand: true, diff --git a/public/views/activity.html b/public/views/activity.html index bfbc44076..c562dfdf5 100644 --- a/public/views/activity.html +++ b/public/views/activity.html @@ -1,10 +1,10 @@ - + Recent Activity - diff --git a/public/views/add.html b/public/views/add.html index 0acc0abfa..b41d8bd08 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -1,29 +1,29 @@ - - + + {{'Add wallet' | translate}} - - +

Create new wallet

- -
+ + - +

Join shared wallet

- -
+ + - +

Import wallet

- -
+ +
diff --git a/public/views/amazon.html b/public/views/amazon.html index 730035d41..1d145f05e 100644 --- a/public/views/amazon.html +++ b/public/views/amazon.html @@ -1,8 +1,8 @@ - + - Gift cards @@ -65,4 +65,3 @@ - diff --git a/public/views/amount.html b/public/views/amount.html index ce54146ad..ab8060e86 100644 --- a/public/views/amount.html +++ b/public/views/amount.html @@ -1,8 +1,8 @@ - + - diff --git a/public/views/backup.html b/public/views/backup.html index f7dceb589..66dddae7e 100644 --- a/public/views/backup.html +++ b/public/views/backup.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/bitpayCard.html b/public/views/bitpayCard.html index 5463dff26..758f2bd01 100644 --- a/public/views/bitpayCard.html +++ b/public/views/bitpayCard.html @@ -1,8 +1,8 @@ - + - BitPay Card @@ -38,7 +38,7 @@ ng-submit="bitpayCard.authenticate()" novalidate> -
+
- @@ -85,7 +85,7 @@
- @@ -216,4 +216,3 @@
- diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html index d428c84e2..b8a6b1eba 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -1,8 +1,8 @@ - + - Buy @@ -154,4 +154,3 @@ - diff --git a/public/views/buyGlidera.html b/public/views/buyGlidera.html index 78621413b..ff7d0bd54 100644 --- a/public/views/buyGlidera.html +++ b/public/views/buyGlidera.html @@ -1,8 +1,8 @@ - + - Buy diff --git a/public/views/buyandsell.html b/public/views/buyandsell.html index a516f5b69..101927d52 100644 --- a/public/views/buyandsell.html +++ b/public/views/buyandsell.html @@ -1,8 +1,8 @@ - + - Buy and sell diff --git a/public/views/confirm.html b/public/views/confirm.html index d2f74bb4c..2d45e16b1 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/copayers.html b/public/views/copayers.html index bba6bec26..aa5b8f626 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -1,10 +1,10 @@ - + {{wallet.name}} - diff --git a/public/views/glidera.html b/public/views/glidera.html index b086db3ea..3c32f93eb 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -1,8 +1,8 @@ - + - Glidera diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html index 626118f94..453da1668 100644 --- a/public/views/glideraUri.html +++ b/public/views/glideraUri.html @@ -1,8 +1,8 @@ - + - Glidera diff --git a/public/views/join.html b/public/views/join.html index 7529baf11..3b535a928 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,8 +1,8 @@ - + - {{'Join shared wallet' | translate}} @@ -17,7 +17,7 @@
-
+
diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html index 6607d1a3a..77b43b5ef 100644 --- a/public/views/modals/addressbook.html +++ b/public/views/modals/addressbook.html @@ -1,8 +1,7 @@ - -
Addressbook diff --git a/public/views/modals/glidera-tx-details.html b/public/views/modals/glidera-tx-details.html index bc19dc485..34e3992d5 100644 --- a/public/views/modals/glidera-tx-details.html +++ b/public/views/modals/glidera-tx-details.html @@ -1,5 +1,5 @@ - + diff --git a/public/views/onboarding/backupWarning.html b/public/views/onboarding/backupWarning.html index 0a5a4086d..88fa653a5 100644 --- a/public/views/onboarding/backupWarning.html +++ b/public/views/onboarding/backupWarning.html @@ -1,8 +1,8 @@ - + - diff --git a/public/views/preferences.html b/public/views/preferences.html index d289e0c40..76cbd551a 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 6970fca97..e768ddc8b 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -1,8 +1,8 @@ - + - diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 0ce5c7c1c..2c821f634 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -1,8 +1,8 @@ - + {{'Advanced Preferences' | translate}} - {{'Back' | translate}} + diff --git a/public/views/preferencesAlias.html b/public/views/preferencesAlias.html index b6a63e546..8a8c72d6b 100644 --- a/public/views/preferencesAlias.html +++ b/public/views/preferencesAlias.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesAltCurrency.html b/public/views/preferencesAltCurrency.html index f9bae64f8..446a50074 100644 --- a/public/views/preferencesAltCurrency.html +++ b/public/views/preferencesAltCurrency.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesBitpayCard.html b/public/views/preferencesBitpayCard.html index b281f8fcb..99f31f893 100644 --- a/public/views/preferencesBitpayCard.html +++ b/public/views/preferencesBitpayCard.html @@ -1,8 +1,8 @@ - + - Preferences @@ -16,4 +16,3 @@ - diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html index c9cd99af8..54df1a81f 100644 --- a/public/views/preferencesBwsUrl.html +++ b/public/views/preferencesBwsUrl.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html index 1114c9011..c0790e3ea 100644 --- a/public/views/preferencesColor.html +++ b/public/views/preferencesColor.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index 16705aae6..c68b8e984 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html index fe4f0f8fd..25a3eaedc 100644 --- a/public/views/preferencesDeleteWords.html +++ b/public/views/preferencesDeleteWords.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index e70230642..2ac020111 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index c5f363d02..89c2d417e 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesGlidera.html b/public/views/preferencesGlidera.html index dedea52b0..d34ef5ff1 100644 --- a/public/views/preferencesGlidera.html +++ b/public/views/preferencesGlidera.html @@ -1,8 +1,8 @@ - + - Preferences @@ -275,4 +275,3 @@ - diff --git a/public/views/preferencesHistory.html b/public/views/preferencesHistory.html index abce175fa..001ab547a 100644 --- a/public/views/preferencesHistory.html +++ b/public/views/preferencesHistory.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesInformation.html b/public/views/preferencesInformation.html index 92355948e..7e5ee438e 100644 --- a/public/views/preferencesInformation.html +++ b/public/views/preferencesInformation.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html index ccc402b60..3adb8a34a 100644 --- a/public/views/preferencesLanguage.html +++ b/public/views/preferencesLanguage.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html index 754e1adbf..dcd0add3e 100644 --- a/public/views/preferencesLogs.html +++ b/public/views/preferencesLogs.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/preferencesUnit.html b/public/views/preferencesUnit.html index a017c7528..520f43fce 100644 --- a/public/views/preferencesUnit.html +++ b/public/views/preferencesUnit.html @@ -1,7 +1,7 @@ - + - {{'Back' | translate}} + diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 2aecfabd8..e6aa011a0 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -1,8 +1,8 @@ - + - Sell diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html index 47044b542..fe741f20c 100644 --- a/public/views/tab-create-personal.html +++ b/public/views/tab-create-personal.html @@ -1,8 +1,8 @@ - + - {{'Create new wallet' | translate}} @@ -16,7 +16,7 @@ -
+