Skip to content

Commit 49044bf

Browse files
Merge pull request #1333 from stakwork/revert-1329-fix-hive-chat
Revert " Fix height display in hivechat"
2 parents 03b1e51 + d27beac commit 49044bf

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

src/config/host.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ export function getHostIncludingDockerHosts() {
3535
export const TribesURL = getHost().startsWith('localhost')
3636
? `http://${getHost()}`
3737
: getHost().startsWith('http')
38-
? getHost()
39-
: `https://${getHost()}`;
38+
? getHost()
39+
: `https://${getHost()}`;
4040

4141
// https://obscure-zebra-94rwjg6r9v37pwg.github.dev/
4242

4343
export function isDevHost() {
44-
return (
45-
window.location.host.includes('localhost') ||
46-
window.location.host.endsWith('-13008.app.github.dev')
47-
);
44+
return window.location.host.includes('localhost') || window.location.host.endsWith('-13008.app.github.dev')
4845
}

src/people/hiveChat/index.tsx

+10-18
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,17 @@ interface LogEntry {
4444
const Container = styled.div<{ collapsed: boolean }>`
4545
display: flex;
4646
flex-direction: column;
47-
height: 96vh;
48-
padding: 0 15px;
47+
height: 95vh;
48+
padding: 0 25px 0 35px;
4949
overflow: hidden;
5050
background: var(--Search-bar-background, #f2f3f5);
5151
margin-left: ${({ collapsed }: { collapsed: boolean }) => (collapsed ? '50px' : '250px')};
5252
transition: margin-left 0.3s ease-in-out;
53-
box-sizing: border-box;
54-
55-
@media (max-width: 900px) {
56-
height: 92vh;
57-
}
5853
`;
5954

6055
const ChatBodyWrapper = styled.div`
6156
display: flex;
62-
flex-direction: column;
57+
flex-direction: row;
6358
padding: 0 !important;
6459
flex: 1;
6560
overflow: hidden;
@@ -68,8 +63,8 @@ const ChatBodyWrapper = styled.div`
6863
const ViewerSection = styled.div`
6964
display: flex;
7065
flex-direction: column;
71-
width: 100%;
72-
height: 40%;
66+
padding-bottom: 60px !important;
67+
width: 70%;
7368
overflow: hidden;
7469
`;
7570

@@ -86,9 +81,6 @@ const ChatSection = styled.div`
8681
flex-direction: column;
8782
flex: 1;
8883
overflow: hidden;
89-
@media (min-width: 768px) {
90-
height: 96%;
91-
}
9284
`;
9385

9486
const ViewerHeader = styled.div`
@@ -146,7 +138,7 @@ const TitleInput = styled.input`
146138
const ChatHistory = styled.div`
147139
flex-grow: 1;
148140
overflow-y: auto;
149-
padding: 10px;
141+
padding: 20px;
150142
display: flex;
151143
flex-direction: column;
152144
background: white;
@@ -185,8 +177,8 @@ const MessageBubble = styled.div<MessageBubbleProps>`
185177

186178
const InputContainer = styled.div`
187179
display: flex;
188-
gap: 8px;
189-
padding: 8px 0;
180+
gap: 12px;
181+
padding: 16px 0;
190182
border-radius: 0 0 8px 8px;
191183
position: sticky;
192184
bottom: 0;
@@ -195,12 +187,12 @@ const InputContainer = styled.div`
195187

196188
const TextArea = styled.textarea`
197189
flex-grow: 1;
198-
padding: 8px;
190+
padding: 12px;
199191
border: 2px solid #848484;
200192
border-radius: 8px;
201193
resize: none;
202194
min-height: 24px;
203-
max-height: 80px;
195+
max-height: 150px;
204196
font-family: inherit;
205197
font-size: 14px;
206198
line-height: 1.4;

0 commit comments

Comments
 (0)