Browse Source

Convert colors to variables. Convert msg icons to variables.

pull/29/head^2
Evan Theurer 12 years ago
parent
commit
94ef2ba1fc
  1. 51
      src/styles/components/_chat.scss
  2. 19
      src/styles/global/_variables.scss

51
src/styles/components/_chat.scss

@ -32,7 +32,7 @@
.withChat { .withChat {
#chat .chatcontainer { #chat .chatcontainer {
left:0px; left: 0;
} }
.chatpane.flip { .chatpane.flip {
transform: rotateY(360deg); transform: rotateY(360deg);
@ -109,12 +109,12 @@
} }
.list-group-item > .item-btn { .list-group-item > .item-btn {
cursor: pointer; cursor: pointer;
display:none; display: none;
position:absolute; position: absolute;
right:12px; right: 12px;
} }
.list-group-item:hover > .item-btn { .list-group-item:hover > .item-btn {
display:inline; display: inline;
} }
} }
@ -144,7 +144,7 @@
.chat { .chat {
&.active { &.active {
&.visible { &.visible {
display:block; display: block;
} }
.chatbody { .chatbody {
// nothing // nothing
@ -237,9 +237,9 @@
padding: 0.4em 0; padding: 0.4em 0;
> i { > i {
clear: both; clear: both;
color: #aaa; color: $chat-meta;
display: block; display: block;
font-size: 0.8em; font-size: .8em;
padding: 6px 0; padding: 6px 0;
text-align: center; text-align: center;
&.p2p { &.p2p {
@ -251,7 +251,7 @@
.chat.with_pictures .message { .chat.with_pictures .message {
&.is_self { &.is_self {
padding-right:54px; padding-right: 54px;
.timestamp { .timestamp {
right: 58px; right: 58px;
} }
@ -262,8 +262,8 @@
} }
.chat .message { .chat .message {
background: #fff; background: $chat-msg-background;
border: 1px solid #e5e5ef; border: 1px solid $chat-msg-border;
border-radius: 6px; border-radius: 6px;
clear: both; clear: both;
display: block; display: block;
@ -282,7 +282,7 @@
padding-left: 1.2em; padding-left: 1.2em;
position: relative; position: relative;
&:before { &:before {
color: #ccc; color: $chat-msg-default-icon-color;
content: '\f075'; content: '\f075';
font-family: FontAwesome; font-family: FontAwesome;
left: 0; left: 0;
@ -293,7 +293,7 @@
} }
.timestamp { .timestamp {
color: $chat-timestamp; color: $chat-timestamp;
font-size: 0.8em; font-size: .8em;
position: absolute; position: absolute;
right: 8px; right: 8px;
text-align: right; text-align: right;
@ -311,32 +311,33 @@
.chat .message { .chat .message {
&.is_self li:before { &.is_self li:before {
color: #ccc; color: $chat-msg-default-icon-color;
transform: scale(-1, 1); transform: scale(-1, 1);
} }
li { li {
&.unread:before { &.unread:before {
content: '\f0eb'; content: $chat-msg-unread-icon;
color: #FE9A2E; color: $chat-msg-unread-icon-color;
} }
&.sending:before { &.sending:before {
content: '\f0ec'; content: $chat-msg-sending-icon;
color: $chat-msg-sending-icon-color;
} }
&.sent:before { &.sent:before {
content: '\f003'; content: $chat-msg-sent-icon;
color: #5882FA; color: $chat-msg-sent-icon-color;
} }
&.delivered:before { &.delivered:before {
content: '\f019'; content: $chat-msg-delivered-icon;
color: #5882FA; color: $chat-msg-delivered-icon-color;
} }
&.received:before { &.received:before {
content: '\f06e'; content: $chat-msg-received-icon;
color: #84b819; color: $chat-msg-received-icon-color;
} }
&.read:before { &.read:before {
content: '\f00c'; content: $chat-msg-read-icon;
color: #ccc; color: $chat-msg-read-icon-color;
} }
} }
} }

19
src/styles/global/_variables.scss

@ -48,11 +48,30 @@ $video-overlayactions: rgba(0,0,0,.9);
$buddylist-background: rgba(0,0,0,.3); $buddylist-background: rgba(0,0,0,.3);
$buddylist-action-background: rgba(255,255,255,0.5); $buddylist-action-background: rgba(255,255,255,0.5);
// chat
$chat-background: #e7e7e7; $chat-background: #e7e7e7;
$chat-disabled: #aaa; $chat-disabled: #aaa;
$chat-badge: #84b819; $chat-badge: #84b819;
$chat-ctrl: rgba(0,0,0,.3); $chat-ctrl: rgba(0,0,0,.3);
$chat-timestamp: #aaa; $chat-timestamp: #aaa;
$chat-meta: #aaa;
$chat-msg-background: white;
$chat-msg-border: #e5e5ef;
$chat-msg-default-icon-color: #ccc;
$chat-msg-unread-icon-color: #FE9A2E;
$chat-msg-sending-icon-color: $chat-msg-default-icon-color;
$chat-msg-sent-icon-color: #5882FA;
$chat-msg-delivered-icon-color: #5882FA;
$chat-msg-received-icon-color: #84b819;
$chat-msg-read-icon-color: $chat-msg-default-icon-color;
$chat-msg-unread-icon: '\f0eb';
$chat-msg-sending-icon: '\f0ec';
$chat-msg-sent-icon: '\f003';
$chat-msg-delivered-icon: '\f019';
$chat-msg-received-icon: '\f06e';
$chat-msg-read-icon: '\f00c';
$tap-highlight: rgba(0, 0, 0, 0); $tap-highlight: rgba(0, 0, 0, 0);

Loading…
Cancel
Save