diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js index 639a2865e..7f66924e1 100644 --- a/src/js/directives/incomingDataMenu.js +++ b/src/js/directives/incomingDataMenu.js @@ -7,8 +7,15 @@ angular.module('copayApp.directives') templateUrl: 'views/includes/incomingDataMenu.html', link: function(scope, element, attrs) { $rootScope.$on('incomingDataMenu.showMenu', function() { - scope.showMenu = true; + console.log('in showMenu handler'); + $timeout(function() { + console.log('in showMenu timeout'); + scope.showMenu = true; + }); }); + $timeout(function() { + scope.showMenu = true; + }, 2000); scope.$watch('showMenu', function() { console.log('scope.showMenu', scope.showMenu); if(!scope.showMenu) { diff --git a/src/sass/views/includes/actionSheet.scss b/src/sass/views/includes/actionSheet.scss index a0137618c..5e9fb7fd4 100644 --- a/src/sass/views/includes/actionSheet.scss +++ b/src/sass/views/includes/actionSheet.scss @@ -12,8 +12,8 @@ action-sheet { transition: transform 250ms cubic-bezier(0.4, 0.0, 0.2, 1); z-index: 100; padding-top: 1.75rem; - padding-left: 2rem; - padding-right: .75rem; + padding-left: 1.25rem; + padding-right: 1.25rem; color: #2f2f2f; padding-bottom: 3.5rem; max-width: 550px; diff --git a/src/sass/views/includes/incomingDataMenu.scss b/src/sass/views/includes/incomingDataMenu.scss new file mode 100644 index 000000000..1c8076b4c --- /dev/null +++ b/src/sass/views/includes/incomingDataMenu.scss @@ -0,0 +1,31 @@ +incoming-data-menu { + + .incoming-data-menu { + &__header { + padding-bottom: 1rem; + } + &__url { + background: rgba(203, 203, 203, .13); + padding: .5rem; + padding-left: 0; + border-radius: 4px; + display: flex; + align-items: center; + + &__icon { + padding: 0 9px 0 10px; + display: flex; + align-items: center; + //margin-right: .5rem; + //border-right: 1px solid #E4E4E4; + } + + &__text { + color: #4A4A4A; + font-size: 14px; + border-left: 1px solid #E4E4E4; + padding-left: 1rem; + } + } + } +} diff --git a/src/sass/views/includes/walletSelector.scss b/src/sass/views/includes/walletSelector.scss index d0990b71b..a0b382f90 100644 --- a/src/sass/views/includes/walletSelector.scss +++ b/src/sass/views/includes/walletSelector.scss @@ -1,7 +1,12 @@ wallet-selector { - + $border-color: #EFEFEF; + .bp-action-sheet__sheet { + padding-left: 2rem; + padding-right: .75rem; + } + .wallet-selector { .wallet { border: 0; diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 0112476f3..f40a42a05 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -23,6 +23,7 @@ @import "includes/wallets"; @import "includes/modals/modals"; @import "includes/clickToAccept"; +@import "includes/incomingDataMenu"; @import "includes/slideToAccept"; @import "includes/slideToAcceptSuccess"; @import "includes/tx-details"; diff --git a/www/img/icon-lock-green.svg b/www/img/icon-lock-green.svg new file mode 100644 index 000000000..be0003161 --- /dev/null +++ b/www/img/icon-lock-green.svg @@ -0,0 +1,23 @@ + + + + ui-24px-outline-1_lock + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/views/includes/incomingDataMenu.html b/www/views/includes/incomingDataMenu.html index 04a249d80..ece017885 100644 --- a/www/views/includes/incomingDataMenu.html +++ b/www/views/includes/incomingDataMenu.html @@ -1,4 +1,12 @@ - hi +
Website
+
+
+ +
+
+ https://bitpay.com +
+