thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tweak conflict style

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-02-16 10:41:10 -08:00
parent 28c763992a
commit f221921127
4 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
background.html
View file

@ -179,7 +179,6 @@
{{ /hasRetry }} {{ /hasRetry }}
{{ #hasConflict }} {{ #hasConflict }}
<div class='hasConflict clearfix'> <div class='hasConflict clearfix'>
<h3>{{ hasConflict }}</h3>
<div class='conflicts'> <div class='conflicts'>
</div> </div>
</div> </div>
@ -277,6 +276,9 @@
</script> </script>
<script type='text/x-tmpl-mustache' id='contact-detail'> <script type='text/x-tmpl-mustache' id='contact-detail'>
<div class='clearfix'> <div class='clearfix'>
{{ #conflict }}
<h3>{{ newIdentity }}</h3>
{{ /conflict }}
{{ #errors }} {{ #errors }}
<span class='error-icon'> <span class='error-icon'>
<span class='error-message'>{{message}}</span> <span class='error-message'>{{message}}</span>

5
js/views/message_detail_view.js
View file

@ -37,7 +37,8 @@
conflict : this.conflict, conflict : this.conflict,
errors : this.errors, errors : this.errors,
verify : i18n('verify'), verify : i18n('verify'),
cancel : i18n('cancel') cancel : i18n('cancel'),
newIdentity: i18n('newIdentity')
}; };
} }
}); });
@ -140,7 +141,7 @@
failedToSend: i18n('failedToSend'), failedToSend: i18n('failedToSend'),
errorLabel : i18n('error'), errorLabel : i18n('error'),
hasRetry : hasRetry, hasRetry : hasRetry,
hasConflict : hasConflict hasConflict : this.model.hasKeyConflicts()
})); }));
this.view.$el.prependTo(this.$('.message-container')); this.view.$el.prependTo(this.$('.message-container'));

15
stylesheets/_conversation.scss
View file

@ -96,11 +96,6 @@
.hasConflict, .hasConflict,
.hasRetry { .hasRetry {
background: #F3F3A7;
padding: 10px 20px;
margin: 0 5px;
border-radius: 5px;
button { button {
outline: none; outline: none;
border: none; border: none;
@ -115,7 +110,15 @@
} }
} }
} }
.conflicts .contact-detail,
.hasRetry { .hasRetry {
background: #F3F3A7;
border-radius: 5px;
padding: 1em;
margin: 1em;
}
.hasRetry {
padding: 10px 20px;
button { button {
margin: 5px; margin: 5px;
background: $blue; background: $blue;
@ -174,8 +177,8 @@
} }
.conflicts .contact-detail { .conflicts .contact-detail {
background: #F3F3A7;
padding: 1em; padding: 1em;
border: 1px solid #ccc;
border-radius: 10px; border-radius: 10px;
} }
.contacts .contact-detail { .contacts .contact-detail {

56
stylesheets/manifest.css
View file

@ -649,35 +649,37 @@ input.search {
.message-detail .container { .message-detail .container {
height: calc(100% - (36px + 4px)); } height: calc(100% - (36px + 4px)); }
.message-detail .hasConflict, .message-detail .hasConflict button,
.message-detail .hasRetry button {
outline: none;
border: none;
border-radius: 5px;
color: white;
padding: 0.5em 1em;
font-weight: bold;
line-height: 18px; }
.message-detail .hasConflict button span,
.message-detail .hasRetry button span {
vertical-align: middle; }
.message-detail .conflicts .contact-detail,
.message-detail .hasRetry { .message-detail .hasRetry {
background: #F3F3A7; background: #F3F3A7;
padding: 10px 20px; border-radius: 5px;
margin: 0 5px; padding: 1em;
border-radius: 5px; } margin: 1em; }
.message-detail .hasConflict button, .message-detail .hasRetry {
padding: 10px 20px; }
.message-detail .hasRetry button { .message-detail .hasRetry button {
outline: none; margin: 5px;
border: none; background: #2090ea; }
border-radius: 5px; .message-detail .hasRetry button:before {
color: white; content: '';
padding: 0.5em 1em; display: inline-block;
font-weight: bold; vertical-align: middle;
line-height: 18px; } width: 18px;
.message-detail .hasConflict button span, height: 18px;
.message-detail .hasRetry button span { background: url("/images/refresh.png") no-repeat center center;
vertical-align: middle; } background-size: 100%; }
.message-detail .hasRetry button {
margin: 5px;
background: #2090ea; }
.message-detail .hasRetry button:before {
content: '';
display: inline-block;
vertical-align: middle;
width: 18px;
height: 18px;
background: url("/images/refresh.png") no-repeat center center;
background-size: 100%; }
.message-detail .message-container { .message-detail .message-container {
background: white; background: white;
padding: 1em 0; } padding: 1em 0; }
@ -706,8 +708,8 @@ input.search {
background: url("/images/refresh.png") no-repeat center center; background: url("/images/refresh.png") no-repeat center center;
background-size: 100%; } background-size: 100%; }
.message-detail .conflicts .contact-detail { .message-detail .conflicts .contact-detail {
background: #F3F3A7;
padding: 1em; padding: 1em;
border: 1px solid #ccc;
border-radius: 10px; } border-radius: 10px; }
.message-detail .contacts .contact-detail { .message-detail .contacts .contact-detail {
padding: 0 36px; } padding: 0 36px; }