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

Tweak delivery receipt and timestamp display

Browse source 
Checkmark is no longer underlined when hovering over the timestamp.
This commit is contained in:
lilia 2015-03-05 16:29:12 -08:00
parent 99787753a8
commit e2bd55c171
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conversation.html
View file

@ -52,7 +52,10 @@
<div class="bubble"> <div class="bubble">
<p class="content">{{ message }}</p> <p class="content">{{ message }}</p>
<div class='attachments'></div> <div class='attachments'></div>
<p class="timestamp">{{ timestamp }}</p> <div class='meta'>
<span class='timestamp'>{{ timestamp }}</span>
<span class='checkmark hide'>✓</span>
</div>
</div> </div>
</script> </script>
<script type='text/x-tmpl-mustache' id='new-group-update-form'> <script type='text/x-tmpl-mustache' id='new-group-update-form'>

10
stylesheets/_conversation.scss
View file

@ -61,9 +61,8 @@
font-size: smaller; font-size: smaller;
} }
.entry .delivered .timestamp::after { .entry .delivered .checkmark {
margin-left: 4px; display: inline;
content: "✓";
} }
@ -160,7 +159,7 @@
color: white; color: white;
background: $blue; background: $blue;
.timestamp { .meta {
color: $blue_l; color: $blue_l;
} }
@ -176,7 +175,6 @@
} }
} }
.attachments { .attachments {
img, audio, video { img, audio, video {
max-width: 100%; max-width: 100%;
@ -198,7 +196,7 @@
border-radius: (36px / 2); border-radius: (36px / 2);
} }
.timestamp { .meta {
margin-top: 3px; margin-top: 3px;
float: right; float: right;
} }

14
stylesheets/manifest.css
View file

@ -1,4 +1,3 @@
@charset "UTF-8";
@font-face { @font-face {
font-family: 'Roboto-Light'; font-family: 'Roboto-Light';
src: url("/fonts/Roboto-Light.ttf") format("truetype"); } src: url("/fonts/Roboto-Light.ttf") format("truetype"); }
@ -323,9 +322,8 @@ input.new-message {
.timestamp { .timestamp {
font-size: smaller; } font-size: smaller; }
.entry .delivered .timestamp::after { .entry .delivered .checkmark {
margin-left: 4px; display: inline; }
content: "✓"; }
.message-list { .message-list {
margin: 0; margin: 0;
@ -401,8 +399,8 @@ input.new-message {
clear: left; clear: left;
color: white; color: white;
background: #2a92e7; } background: #2a92e7; }
.message-detail .outgoing .bubble .timestamp, .message-detail .outgoing .bubble .meta,
.message-list .outgoing .bubble .timestamp { .message-list .outgoing .bubble .meta {
color: #a2d2f4; } color: #a2d2f4; }
.message-detail .outgoing .bubble::before, .message-detail .outgoing .bubble::before,
.message-list .outgoing .bubble::before { .message-list .outgoing .bubble::before {
@ -429,8 +427,8 @@ input.new-message {
width: 36px; width: 36px;
background: #f3f3f3; background: #f3f3f3;
border-radius: 18px; } border-radius: 18px; }
.message-detail .timestamp, .message-detail .meta,
.message-list .timestamp { .message-list .meta {
margin-top: 3px; margin-top: 3px;
float: right; } float: right; }
.message-detail .end-session, .message-detail .end-session,