moparisthebest
/
kaiwa
mirror of https://github.com/moparisthebest/kaiwa
1
0
Fork 0
Code Issues Releases Wiki Activity

CSS: MUC names

This commit is contained in:
Sebastien Hut 2015-01-24 16:03:12 +01:00
parent 204c2568d1
commit 4b92a8822d
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientapp/templates.js
View File

@ -491,7 +491,7 @@ exports.pages.chat = function anonymous(locals) {
exports.pages.groupchat = function anonymous(locals) { exports.pages.groupchat = function anonymous(locals) {
var buf = []; var buf = [];
with (locals || {}) { with (locals || {}) {
buf.push('<section class="page chat"><section class="group conversation"><header class="online"><h1><span class="prefix">#</span><span class="name"></span><i class="channel_actions fa fa-chevron-down"></i><span contenteditable="true" spellcheck="false" class="status"></span></h1></header><ul class="messages"></ul><a id="members_toggle"><i class="fa fa-user"></i><span id="members_toggle_count"></span></a><ul class="groupRoster"></ul><div class="chatBox"><form class="formwrap"><textarea name="chatInput" type="text" placeholder="Send a message..." autocomplete="off"></textarea></form></div></section></section>'); buf.push('<section class="page chat"><section class="group conversation"><header class="online"><h1><span class="prefix">#</span><span class="name"></span><i class="channel_actions fa fa-comments-o"></i><span contenteditable="true" spellcheck="false" class="status"></span></h1></header><ul class="messages"></ul><a id="members_toggle"><i class="fa fa-user"></i><span id="members_toggle_count"></span></a><ul class="groupRoster"></ul><div class="chatBox"><form class="formwrap"><textarea name="chatInput" type="text" placeholder="Send a message..." autocomplete="off"></textarea></form></div></section></section>');
} }
return buf.join(""); return buf.join("");
}; };

2
clientapp/templates/pages/groupchat.jade
View File

@ -4,7 +4,7 @@ section.page.chat
h1 h1
span.prefix # span.prefix #
span.name span.name
i.channel_actions.fa.fa-chevron-down i.channel_actions.fa.fa-comments-o
span.status(contenteditable="true", spellcheck="false") span.status(contenteditable="true", spellcheck="false")
ul.messages ul.messages
a#members_toggle a#members_toggle

12
public/css/otalk.css
View File

@ -1002,9 +1002,6 @@ button.secondary:hover:not(:disabled) {
display: inline-block; display: inline-block;
height: 53px; height: 53px;
} }
.conversation header h1:hover .prefix {
color: #555459;
}
.conversation header .prefix, .conversation header .prefix,
.conversation header .name, .conversation header .name,
.conversation header .user_presence, .conversation header .user_presence,
@ -1023,7 +1020,7 @@ button.secondary:hover:not(:disabled) {
font-weight: 500; font-weight: 500;
margin-left: 25px; margin-left: 25px;
line-height: 53px; line-height: 53px;
cursor: pointer; cursor: default;
} }
.conversation header .name { .conversation header .name {
font-size: 22px; font-size: 22px;
@ -1032,18 +1029,18 @@ button.secondary:hover:not(:disabled) {
text-overflow: ellipsis; text-overflow: ellipsis;
padding-left: 3px; padding-left: 3px;
line-height: 53px; line-height: 53px;
cursor: pointer; cursor: default;
} }
.conversation header .user_presence, .conversation header .user_presence,
.conversation header .channel_actions { .conversation header .channel_actions {
font-size: 12px;
color: #9e9ea6; color: #9e9ea6;
padding-left: 8px; padding-left: 8px;
line-height: 53px; line-height: 53px;
cursor: pointer; cursor: default;
} }
.conversation header .user_presence { .conversation header .user_presence {
padding-top: 5px; padding-top: 5px;
font-size: 12px;
} }
.conversation header .user_presence.online { .conversation header .user_presence.online {
color: #4c9689; color: #4c9689;
@ -1073,6 +1070,7 @@ button.secondary:hover:not(:disabled) {
} }
.conversation .channel_actions { .conversation .channel_actions {
opacity: 1; opacity: 1;
font-size: 20px;
} }
.conversation .status { .conversation .status {
color: #9e9ea6; color: #9e9ea6;

12
public/css/pages/chat.styl
View File

@ -38,9 +38,6 @@
display: inline-block display: inline-block
height: 53px height: 53px
&:hover .prefix
color: $gray-dark
.prefix, .name, .user_presence, .channel_actions, .status .prefix, .name, .user_presence, .channel_actions, .status
display: inline-block display: inline-block
color: $gray-dark color: $gray-dark
@ -55,7 +52,7 @@
font-weight: $font-weight-classic font-weight: $font-weight-classic
margin-left: 25px margin-left: 25px
line-height: 53px line-height: 53px
cursor: pointer cursor: default
.name .name
font-size: $font-size-h2 font-size: $font-size-h2
@ -64,17 +61,17 @@
text-overflow: ellipsis text-overflow: ellipsis
padding-left: 3px padding-left: 3px
line-height: 53px line-height: 53px
cursor: pointer cursor: default
.user_presence, .channel_actions .user_presence, .channel_actions
font-size: $font-size-small
color: $gray color: $gray
padding-left: 8px padding-left: 8px
line-height: 53px line-height: 53px
cursor: pointer cursor: default
.user_presence .user_presence
padding-top: 5px padding-top: 5px
font-size: $font-size-small
&.online &.online
color: $green color: $green
@ -103,6 +100,7 @@
.channel_actions .channel_actions
opacity: 1 opacity: 1
font-size: 20px
.status .status
color: $gray color: $gray