From 89f37e4bc03e70ea6209611170b79b08d9be23fa Mon Sep 17 00:00:00 2001 From: Ben Halpern Date: Wed, 13 Jun 2018 15:55:33 -0400 Subject: [PATCH] Fiddle with chat expand styles (#429) --- app/assets/stylesheets/chat.scss | 11 ++++++++--- app/javascript/chat/channels.jsx | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/chat.scss b/app/assets/stylesheets/chat.scss index bfc0576a3..9d16fb600 100644 --- a/app/assets/stylesheets/chat.scss +++ b/app/assets/stylesheets/chat.scss @@ -65,6 +65,11 @@ .chat__channels--expanded{ width: 180px; + @media screen and ( min-width: 1000px ){ + .chat__channelstogglebutt{ + display: none; + } + } } .chat__channelstogglebutt{ @@ -75,9 +80,6 @@ -webkit-appearance: none; font-size: 18px; font-weight: bold; - img{ - width: 100%; - } } .chat__channels input { @@ -88,6 +90,9 @@ padding: 8px; margin-left: 2px; font-size: 14px; + @media screen and ( min-width: 1000px ){ + width: calc(100% - 12px); + } } .chat_chatconfig{ diff --git a/app/javascript/chat/channels.jsx b/app/javascript/chat/channels.jsx index 01d7c1af8..ee0f0355f 100644 --- a/app/javascript/chat/channels.jsx +++ b/app/javascript/chat/channels.jsx @@ -64,7 +64,6 @@ const Channels = ({ activeChannelId, chatChannels, handleSwitchChannel, expanded style={{border:`1px solid ${channelColor}`, boxShadow: `3px 3px 0px ${channelColor}`}} > {content} -=======