diff --git a/src/font/icons.eot b/src/font/icons.eot index 8909197..0388513 100755 Binary files a/src/font/icons.eot and b/src/font/icons.eot differ diff --git a/src/font/icons.svg b/src/font/icons.svg index e5cd5a6..de5c163 100755 --- a/src/font/icons.svg +++ b/src/font/icons.svg @@ -3,7 +3,7 @@ Generated by IcoMoon - + @@ -17,4 +17,5 @@ + \ No newline at end of file diff --git a/src/font/icons.ttf b/src/font/icons.ttf index b0a6b99..2e45a95 100755 Binary files a/src/font/icons.ttf and b/src/font/icons.ttf differ diff --git a/src/font/icons.woff b/src/font/icons.woff index 84c6881..bf8962e 100755 Binary files a/src/font/icons.woff and b/src/font/icons.woff differ diff --git a/src/js/controller/login-initial.js b/src/js/controller/login-initial.js index 800fcee..854cf1f 100644 --- a/src/js/controller/login-initial.js +++ b/src/js/controller/login-initial.js @@ -21,7 +21,6 @@ define(function(require) { }; $scope.state.ui = states.IDLE; // initial state - // // scope functions // diff --git a/src/js/controller/popover.js b/src/js/controller/popover.js index 4cb1299..32148eb 100644 --- a/src/js/controller/popover.js +++ b/src/js/controller/popover.js @@ -18,14 +18,8 @@ define(function(require) { var ngModule = angular.module('popover', []); ngModule.directive('popover', function() { return function(scope, elm, attrs) { - var popover = angular.element(document.querySelector('.popover')); - - var model = attrs.popover; - scope.$watch(model, function(value) { - // set popover title and content - scope.state.popover.title = attrs.popoverTitle; - scope.state.popover.content = value; - }); + var selector = attrs.popover; + var popover = angular.element(document.querySelector(selector)); elm.on('mouseover', function() { // set popover position diff --git a/src/sass/components/_popover.scss b/src/sass/components/_popover.scss index 30ca392..6a7525e 100644 --- a/src/sass/components/_popover.scss +++ b/src/sass/components/_popover.scss @@ -121,4 +121,10 @@ border-left-color: #ffffff; bottom: -10px; } +} + +.popover-info { + cursor: pointer; + color: $color-blue; + margin-left: 5px; } \ No newline at end of file diff --git a/src/tpl/desktop.html b/src/tpl/desktop.html index 566c9a0..2ab6f22 100644 --- a/src/tpl/desktop.html +++ b/src/tpl/desktop.html @@ -27,13 +27,4 @@
-
- - -
-
-
-
{{state.popover.title}}
-
-
{{state.popover.content}}
-
\ No newline at end of file + \ No newline at end of file diff --git a/src/tpl/login-existing.html b/src/tpl/login-existing.html index f561b9a..bba0a46 100644 --- a/src/tpl/login-existing.html +++ b/src/tpl/login-existing.html @@ -11,6 +11,7 @@
+
@@ -22,4 +23,15 @@
-
\ No newline at end of file +
+ + +
+
+
What is this?
+
+

The passphrase protects your encrypted mailbox.

+

There is no way to access your messages without your passphrase.

+

If you have forgotten your passphrase, please request an account reset by sending an email to support@whiteout.io. You will not be able to read previous messages after a reset.

+
+
\ No newline at end of file diff --git a/src/tpl/login-initial.html b/src/tpl/login-initial.html index 6a67239..48f5edd 100644 --- a/src/tpl/login-initial.html +++ b/src/tpl/login-initial.html @@ -12,6 +12,7 @@
+
@@ -37,4 +38,16 @@
-
\ No newline at end of file +
+ + +
+
+
What is this?
+
+

A passphrase is like a password but longer.

+

If your device is lost or stolen the passphrase protects the contents of your mailbox.

+

The passphrase should consist of multiple words that are easy to remember.

+

You cannot change your passphrase at a later time.

+
+
\ No newline at end of file diff --git a/src/tpl/login-new-device.html b/src/tpl/login-new-device.html index 1a7ad92..ae8b01c 100644 --- a/src/tpl/login-new-device.html +++ b/src/tpl/login-new-device.html @@ -9,8 +9,14 @@

You are already registered on another device. To access your emails on this device, please import your key file.

-
-
+
+ + +
+
+ + +
@@ -19,4 +25,25 @@
-
\ No newline at end of file + + + +
+
+
What is this?
+
+

The keyfile contains your PGP keys.

+

It can be exported on your first computer under "Account".

+

You can import it from a USB flash drive. Never send the keyfile to yourself via email.

+
+
+ +
+
+
What is this?
+
+

The passphrase protects your encrypted mailbox.

+

There is no way to access your messages without your passphrase.

+

If you have forgotten your passphrase, please request an account reset by sending an email to support@whiteout.io. You will not be able to read previous messages after a reset.

+
+
\ No newline at end of file diff --git a/src/tpl/read.html b/src/tpl/read.html index 4a4b377..b76b26d 100644 --- a/src/tpl/read.html +++ b/src/tpl/read.html @@ -9,10 +9,10 @@

{{state.mailList.selected.subject || 'No subject'}}

{{state.mailList.selected.sentDate | date:'EEEE, MMM d, yyyy h:mm a'}}

- From: {{f.name || f.address}} + From: {{f.name || f.address}}

- To: {{t.address}} + To: {{t.address}}

@@ -29,4 +29,11 @@ {{line}}

- \ No newline at end of file + + +
+
+
Fingerprint
+
{{fingerprint}}
+
+