From 4b92a8822d91dd43206038ac5e935f730fa0b74b Mon Sep 17 00:00:00 2001 From: Sebastien Hut Date: Sat, 24 Jan 2015 16:03:12 +0100 Subject: [PATCH] CSS: MUC names --- clientapp/templates.js | 2 +- clientapp/templates/pages/groupchat.jade | 2 +- public/css/otalk.css | 12 +++++------- public/css/pages/chat.styl | 12 +++++------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/clientapp/templates.js b/clientapp/templates.js index aa8265b..7c4eeae 100644 --- a/clientapp/templates.js +++ b/clientapp/templates.js @@ -491,7 +491,7 @@ exports.pages.chat = function anonymous(locals) { exports.pages.groupchat = function anonymous(locals) { var buf = []; with (locals || {}) { - buf.push('

#

      '); + buf.push('

      #

          '); } return buf.join(""); }; diff --git a/clientapp/templates/pages/groupchat.jade b/clientapp/templates/pages/groupchat.jade index ee225d2..d6915a6 100644 --- a/clientapp/templates/pages/groupchat.jade +++ b/clientapp/templates/pages/groupchat.jade @@ -4,7 +4,7 @@ section.page.chat h1 span.prefix # span.name - i.channel_actions.fa.fa-chevron-down + i.channel_actions.fa.fa-comments-o span.status(contenteditable="true", spellcheck="false") ul.messages a#members_toggle diff --git a/public/css/otalk.css b/public/css/otalk.css index 0da7882..aad62c7 100644 --- a/public/css/otalk.css +++ b/public/css/otalk.css @@ -1002,9 +1002,6 @@ button.secondary:hover:not(:disabled) { display: inline-block; height: 53px; } -.conversation header h1:hover .prefix { - color: #555459; -} .conversation header .prefix, .conversation header .name, .conversation header .user_presence, @@ -1023,7 +1020,7 @@ button.secondary:hover:not(:disabled) { font-weight: 500; margin-left: 25px; line-height: 53px; - cursor: pointer; + cursor: default; } .conversation header .name { font-size: 22px; @@ -1032,18 +1029,18 @@ button.secondary:hover:not(:disabled) { text-overflow: ellipsis; padding-left: 3px; line-height: 53px; - cursor: pointer; + cursor: default; } .conversation header .user_presence, .conversation header .channel_actions { - font-size: 12px; color: #9e9ea6; padding-left: 8px; line-height: 53px; - cursor: pointer; + cursor: default; } .conversation header .user_presence { padding-top: 5px; + font-size: 12px; } .conversation header .user_presence.online { color: #4c9689; @@ -1073,6 +1070,7 @@ button.secondary:hover:not(:disabled) { } .conversation .channel_actions { opacity: 1; + font-size: 20px; } .conversation .status { color: #9e9ea6; diff --git a/public/css/pages/chat.styl b/public/css/pages/chat.styl index 99c799b..591a9ac 100644 --- a/public/css/pages/chat.styl +++ b/public/css/pages/chat.styl @@ -38,9 +38,6 @@ display: inline-block height: 53px - &:hover .prefix - color: $gray-dark - .prefix, .name, .user_presence, .channel_actions, .status display: inline-block color: $gray-dark @@ -55,7 +52,7 @@ font-weight: $font-weight-classic margin-left: 25px line-height: 53px - cursor: pointer + cursor: default .name font-size: $font-size-h2 @@ -64,17 +61,17 @@ text-overflow: ellipsis padding-left: 3px line-height: 53px - cursor: pointer + cursor: default .user_presence, .channel_actions - font-size: $font-size-small color: $gray padding-left: 8px line-height: 53px - cursor: pointer + cursor: default .user_presence padding-top: 5px + font-size: $font-size-small &.online color: $green @@ -103,6 +100,7 @@ .channel_actions opacity: 1 + font-size: 20px .status color: $gray