From bd69e08dc27a2d37935410ca7f04f2e328180707 Mon Sep 17 00:00:00 2001 From: Gabriel Engel <gabriel.engel@fgsys.com> Date: Tue, 26 May 2015 01:05:08 -0300 Subject: [PATCH] changing channel and user icons to # and @ --- client/stylesheets/base.less | 35 +++---------------- client/views/app/asideNav/chatRoomItem.coffee | 4 +-- client/views/app/privateHistory.coffee | 4 +-- client/views/app/roomSearch.coffee | 6 ++-- 4 files changed, 11 insertions(+), 38 deletions(-) diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less index 665abd77ed7..8f519131428 100644 --- a/client/stylesheets/base.less +++ b/client/stylesheets/base.less @@ -462,22 +462,22 @@ label.required:after { } .status-offline, -.icon-user.status-offline { +.icon-at.status-offline { color: @status-offline; } .status-online, -.icon-user.status-online { +.icon-at.status-online { color: @status-online !important; } .status-busy, -.icon-user.status-busy { +.icon-at.status-busy { color: @status-busy; } .status-away, -.icon-user.status-away { +.icon-at.status-away { color: @status-away !important; } @@ -551,14 +551,6 @@ label.required:after { z-index: 1; .transition(opacity .1s ease-out); } - .fa { - text-align: center; - width: 20px; - font-size: 18px; - vertical-align: middle; - position: relative; - z-index: 2; - } &:hover { text-decoration: none; color: #FFF; @@ -1055,13 +1047,6 @@ a.github-fork { position: relative; } margin-right: 20px; - .fa { - display: block; - position: absolute; - top: 10px; - left: 8px; - color: @secondary-font-color; - } } h3 { &:extend(.small-title); @@ -1804,9 +1789,6 @@ a.github-fork { border-right: 2px; border-radius: 2px; } - .fa { - margin-right: 3px; - } } .box { position: relative; @@ -1833,9 +1815,6 @@ a.github-fork { background-color: #CDCDCD; border-right: 2px; } - .fa { - margin-right: 3px; - } } .links { i { @@ -2428,12 +2407,6 @@ a.github-fork { font-weight: 400; padding: 16px 20px; margin-top: 20px; - .fa { - width: 20px; - margin-right: 4px; - vertical-align: text-top; - margin-top: -3px; - } } h1 { font-weight: 700; diff --git a/client/views/app/asideNav/chatRoomItem.coffee b/client/views/app/asideNav/chatRoomItem.coffee index 42b992dc519..c79899370f5 100644 --- a/client/views/app/asideNav/chatRoomItem.coffee +++ b/client/views/app/asideNav/chatRoomItem.coffee @@ -20,8 +20,8 @@ Template.chatRoomItem.helpers roomIcon: -> switch this.t - when 'd' then return 'icon-user' - when 'g' then return 'icon-users' + when 'd' then return 'icon-at' + when 'g' then return 'icon-hash' active: -> return 'active' if Router.current().params._id? and Router.current().params._id is this.rid diff --git a/client/views/app/privateHistory.coffee b/client/views/app/privateHistory.coffee index 64b44609604..ab23f4d2321 100644 --- a/client/views/app/privateHistory.coffee +++ b/client/views/app/privateHistory.coffee @@ -8,8 +8,8 @@ Template.privateHistory.helpers type: -> switch this.t - when 'd' then 'icon-user' - when 'g' then 'icon-users' + when 'd' then 'icon-at' + when 'g' then 'icon-hash' when 'v' then 'icon-comment' creation: -> diff --git a/client/views/app/roomSearch.coffee b/client/views/app/roomSearch.coffee index 52bfcea89b9..9f09f54c1de 100644 --- a/client/views/app/roomSearch.coffee +++ b/client/views/app/roomSearch.coffee @@ -1,11 +1,11 @@ Template.roomSearch.helpers roomIcon: -> - return 'icon-user' if this.type is 'u' + return 'icon-at' if this.type is 'u' if this.type is 'r' switch this.t - when 'd' then return 'icon-user' - when 'g' then return 'icon-users' + when 'd' then return 'icon-at' + when 'g' then return 'icon-hash' userStatus: -> if this.type is 'u' -- GitLab