moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #251 from whiteout-io/dev/WO-773 

Dev/wo 773
This commit is contained in:
Felix Hammerl 2015-01-19 10:34:47 +01:00
parent d3b54187cb c271dc91dc
commit 753cd1a4d7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tpl/privatekey-upload.html
View File

@ -26,7 +26,7 @@
<p class="typo-paragraph">Please confirm the keychain code you have written down.</p>
<form class="form">
<input type="text" class="input-text" ng-model="inputCode" wo-input-code wo-focus-me="step === 2"
required pattern="([a-zA-Z0-9\-]*)" placeholder="0000-0000-0000-0000-0000-0000">
required pattern="([a-zA-Z0-9\-]*)" placeholder="0000-0000-0000-0000-0000-0000">
</form>
</div>
@ -38,7 +38,7 @@
</div>
<div ng-show="step === 4">
<div class="spinner-block spinner-block--standalone" ng-show="busy">
<div class="spinner-block spinner-block--standalone">
<span class="spinner spinner--big"></span>
</div>
</div>

7
src/tpl/write.html
View File

@ -8,8 +8,9 @@
<div class="lightbox__content write">
<header class="write__header">
<div class="mail-addresses" focus-input="state.lightbox === 'write' && writerTitle !== 'Reply'"
focus-input-on-click>
<div class="mail-addresses"
focus-input="state.lightbox === 'write' && writerTitle !== 'Reply'"
focus-input-on-click>
<div class="mail-addresses__more">
<button wo-touch="showCC = true;" ng-hide="showCC">Cc</button>
<button wo-touch="showBCC = true;" ng-hide="showBCC">Bcc</button>
@ -23,7 +24,6 @@
</tags-input>
</div>
<div class="mail-addresses" ng-show="showCC === true"
focus-input="state.lightbox === 'write' && writerTitle !== 'Reply'"
focus-input-on-click>
<label>Cc:</label>
<tags-input class="tags-input" ng-model="cc" type="email" tabindex="1" add-on-space="true" add-on-enter="true" enable-editing-last-tag="true"
@ -34,7 +34,6 @@
</tags-input>
</div>
<div class="mail-addresses" ng-show="showBCC === true"
focus-input="state.lightbox === 'write' && writerTitle !== 'Reply'"
focus-input-on-click>
<label>Bcc:</label>
<tags-input class="tags-input" ng-model="bcc" type="email" tabindex="1" add-on-space="true" add-on-enter="true" enable-editing-last-tag="true"