From 441562285c558ac32277cf99605cae3c35f9a602 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Fri, 28 Feb 2014 13:50:00 +0100 Subject: [PATCH] transition to red buttons in writer for all elements when receiver insecure --- src/js/controller/write.js | 4 +++- src/sass/components/_buttons.scss | 2 +- src/sass/views/_write.scss | 10 ++-------- src/tpl/write.html | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/js/controller/write.js b/src/js/controller/write.js index 9cea13c..fd21876 100644 --- a/src/js/controller/write.js +++ b/src/js/controller/write.js @@ -105,6 +105,7 @@ define(function(require) { // set display to insecure while fetching keys recipient.key = undefined; recipient.secure = false; + $scope.checkSendStatus(); // verify email address if (!util.validateEmailAddress(recipient.address)) { @@ -466,7 +467,8 @@ define(function(require) { ngModule.directive('attachmentBtn', function() { return function(scope, elm) { - elm.on('click', function() { + elm.on('click touchstart', function(e) { + e.preventDefault(); document.querySelector('#attachment-input').click(); }); }; diff --git a/src/sass/components/_buttons.scss b/src/sass/components/_buttons.scss index 2a9a110..024ce38 100755 --- a/src/sass/components/_buttons.scss +++ b/src/sass/components/_buttons.scss @@ -32,7 +32,7 @@ background-image: none; box-shadow: none; top: 1px; - left: 1px; + right: -1px; } &.disabled, diff --git a/src/sass/views/_write.scss b/src/sass/views/_write.scss index 6c5ad96..c09feff 100644 --- a/src/sass/views/_write.scss +++ b/src/sass/views/_write.scss @@ -70,14 +70,8 @@ right: 0; padding: em(7.5) em(7.5) em(4) em(7.5); margin: em(5); - outline: none; - color: $color-grey-lightest; - background-color: $color-blue; - - &:hover, - &:focus { - background-color: lighten($color-blue, 10%); - } + font-size: 1em; + outline: 0; &:active, &.active { diff --git a/src/tpl/write.html b/src/tpl/write.html index da543f8..7a89620 100644 --- a/src/tpl/write.html +++ b/src/tpl/write.html @@ -26,7 +26,7 @@ -