colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restyle error icons, move them outside the bubble

Browse Source
This commit is contained in:
lilia
2016-04-14 16:42:42 -07:00
parent 89d3b772d5
commit b6f785737c
7 changed files with 186 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
background.html
View File

@@ -304,16 +304,29 @@
<script type='text/x-tmpl-mustache' id='generic-error'>
<p>{{ message }}</p>
</script>
<script type='text/x-tmpl-mustache' id='error-icon'>
<span class='error-icon'>
</span>
{{ #message }}
<span class='error-message'>{{message}}</span>
{{ /message }}
</script>
<script type='text/x-tmpl-mustache' id='contact-detail'>
<div class='clearfix'>
{{ #errors }}
<span class='error-icon'>
<span class='error-message'>{{message}}</span>
</span>
{{ /errors }}
{{> avatar }}
<span class='name'>{{ name }}
</span>
<div class='contact-details'>
{{ #errors }}
<div class='error-icon-container'>
<span class='error-icon'></span>
</div>
{{ /errors }}
<span class='name'>{{ name }}</span>
{{ #errors }}
{{ #message }}
<p class='error-message'>{{message}}</p>
{{ /message }}
{{ /errors }}
</div>
</div>
</script>
<script type='text/x-tmpl-mustache' id='link_to_support'>
@@ -324,11 +337,13 @@
<script type='text/x-tmpl-mustache' id='key-conflict-dialogue'>
<h3 class='header'>{{ newIdentity }}</h3>
<div class='content clearfix'>
{{> avatar }}
<span class='name'>{{ name }}</span>
<button class='resolve'>{{ resolve }}</button>
<a href='#' class='hideKeys hide'> {{ hideKeys }} </a>
<a href='#' class='showKeys'> {{ showKeys }} </a>
<div class='clearfix'>
{{> avatar }}
<span class='name'>{{ name }}</span>
<button class='resolve'>{{ resolve }}</button>
<a href='#' class='hideKeys hide'> {{ hideKeys }} </a>
<a href='#' class='showKeys'> {{ showKeys }} </a>
</div>
<div class='keys hide'>
<p>
{{ message }}