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

Simplify and correct message metadata alignment

Browse source 
Match left/right adjustment on Android.
Incoming to the left, outgoing to the right.
This commit is contained in:
lilia 2016-10-12 10:52:34 +09:00
parent b5f5c4604c
commit d5431a942f
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
stylesheets/_conversation.scss
View file

@ -337,7 +337,6 @@ li.entry .error-icon-container {
.meta { .meta {
font-size: smaller; font-size: smaller;
margin-top: 3px; margin-top: 3px;
float: right;
text-align: right; text-align: right;
line-height: 18px; line-height: 18px;
@ -356,7 +355,7 @@ li.entry .error-icon-container {
cursor: pointer; cursor: pointer;
} }
.hasRetry, .timestamp, .status { .hasRetry, .timestamp, .status, .timer {
float: left; float: left;
} }
@ -395,6 +394,9 @@ li.entry .error-icon-container {
} }
.outgoing { .outgoing {
.meta {
float: right;
}
.error-icon-container { .error-icon-container {
left: auto; left: auto;
right: calc(100% + 5px); right: calc(100% + 5px);

6
stylesheets/_ios.scss
View file

@ -146,12 +146,6 @@ $ios-border-color: rgba(0,0,0,0.1);
} }
float: right; float: right;
} }
.timestamp {
float: none;
}
.status {
float: right;
}
} }
.attachment { .attachment {
a { a {

13
stylesheets/manifest.css
View file

@ -1175,7 +1175,6 @@ li.entry .error-icon-container {
.message-list .meta { .message-list .meta {
font-size: smaller; font-size: smaller;
margin-top: 3px; margin-top: 3px;
float: right;
text-align: right; text-align: right;
line-height: 18px; } line-height: 18px; }
.message-container .meta .hasRetry + .timestamp:before, .message-container .meta .hasRetry + .timestamp:before,
@ -1189,10 +1188,11 @@ li.entry .error-icon-container {
.message-list .meta .retry { .message-list .meta .retry {
text-decoration: underline; text-decoration: underline;
cursor: pointer; } cursor: pointer; }
.message-container .meta .hasRetry, .message-container .meta .timestamp, .message-container .meta .status, .message-container .meta .hasRetry, .message-container .meta .timestamp, .message-container .meta .status, .message-container .meta .timer,
.message-list .meta .hasRetry, .message-list .meta .hasRetry,
.message-list .meta .timestamp, .message-list .meta .timestamp,
.message-list .meta .status { .message-list .meta .status,
.message-list .meta .timer {
float: left; } float: left; }
.message-container .meta .timestamp, .message-container .meta .status, .message-container .meta .timestamp, .message-container .meta .status,
.message-list .meta .timestamp, .message-list .meta .timestamp,
@ -1230,6 +1230,9 @@ li.entry .error-icon-container {
.message-list .incoming .avatar, .message-list .incoming .avatar,
.message-list .incoming .bubble { .message-list .incoming .bubble {
float: left; } float: left; }
.message-container .outgoing .meta,
.message-list .outgoing .meta {
float: right; }
.message-container .outgoing .error-icon-container, .message-container .outgoing .error-icon-container,
.message-list .outgoing .error-icon-container { .message-list .outgoing .error-icon-container {
left: auto; left: auto;
@ -1515,10 +1518,6 @@ li.entry .error-icon-container {
.ios .outgoing .content::selection, .ios .outgoing .content .body::selection, .ios .outgoing .content a::selection { .ios .outgoing .content::selection, .ios .outgoing .content .body::selection, .ios .outgoing .content a::selection {
background: white; background: white;
color: #454545; } color: #454545; }
.ios .outgoing .timestamp {
float: none; }
.ios .outgoing .status {
float: right; }
.ios .attachment { .ios .attachment {
margin-bottom: 1px; } margin-bottom: 1px; }
.ios .attachment a { .ios .attachment a {