Add top bar Connect icon 😱 (#443)

This commit is contained in:
Ben Halpern 2018-06-14 13:50:55 -04:00 committed by GitHub
parent 1366d315a3
commit ad733aa9fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions

View file

@ -44,7 +44,7 @@
display:none;
}
.write{
width:110px;
width:100px;
padding: 3px 0px;
height: auto;
top:12px;
@ -54,11 +54,11 @@
border: 2px solid $black;
@media screen and ( min-width: 560px ){
display:block;
right:105px;
right:140px;
}
@media screen and ( min-width: 700px ){
display:block;
right:120px;
right:165px;
}
}
.connect-icon{
@ -69,7 +69,6 @@
z-index:10;
top:1px;
right:90px;
display: none;
@media screen and ( min-width:700px ){
right:110px;
}

View file

@ -87,16 +87,18 @@ class ChatChannelsController < ApplicationController
chat_channel_memberships.includes(:chat_channel).limit(200).order("updated_at DESC")
render "index.json"
end
def render_channels_html
return unless current_user
slug = if params[:slug] && params[:slug].start_with?("@")
[current_user.username, params[:slug].gsub("@", "")].sort.join("/")
else
params[:slug]
end
@active_channel = ChatChannel.find_by_slug(slug)
@active_channel.current_user = current_user if @active_channel
if params[:slug]
slug = if params[:slug] && params[:slug].start_with?("@")
[current_user.username, params[:slug].gsub("@", "")].sort.join("/")
else
params[:slug]
end
@active_channel = ChatChannel.find_by_slug(slug)
@active_channel.current_user = current_user if @active_channel
end
generate_algolia_search_key
# @twilio_token = TwilioToken.new(current_user).get
end

View file

@ -49,6 +49,7 @@ class UnopenedChannelNotice extends Component {
}
handleClick = e => {
document.getElementById("connect-number").classList.remove("showing");
this.setState({visible: false})
}
render() {