Skip to content

Commit

Permalink
Chat Style
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsofiz authored and alfonsofiz committed Aug 3, 2016
1 parent f499cf5 commit dbabca7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
8 changes: 7 additions & 1 deletion packages/rocketchat-theme/assets/stylesheets/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -2507,6 +2507,7 @@ a.github-fork {
}

.message {
display: inline-block;
padding: 8px 8px 8px 15px;
position: relative;
line-height: 20px;
Expand All @@ -2516,8 +2517,11 @@ a.github-fork {
box-shadow: 0px 1px 2px rgba(0,0,0,.15);

&.own {
float: right;
background-color: #DCF8C6;
text-align: right;
margin-left: 50px;
margin-right: 20px;
}

&.highlight {
Expand All @@ -2534,7 +2538,9 @@ a.github-fork {
}
.time {
display: block;
font-size: 11px;
color: grey;
font-size: 8px;
line-height: 10px;
}
&.new-day {
margin-top: 60px;
Expand Down
5 changes: 4 additions & 1 deletion packages/rocketchat-ui-message/message/message.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template name="message">
<li id="{{_id}}" class="message {{isSequential}} {{isPinned}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
<li>
<div id="{{_id}}" class="message {{isSequential}} {{isPinned}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{customClass}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
<!--{{#if avatar}}
{{#if avatarFromUsername}}
<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
Expand Down Expand Up @@ -100,5 +101,7 @@
<span class="icon-people-plus"></span>
</li>
</ul>
</div>
<div style="clear:both;"></div>
</li>
</template>

0 comments on commit dbabca7

Please sign in to comment.