diff --git a/net/web/src/constants/Colors.js b/net/web/src/constants/Colors.js index 95db9883..8127b79c 100644 --- a/net/web/src/constants/Colors.js +++ b/net/web/src/constants/Colors.js @@ -1,6 +1,6 @@ const Colors = { background: '#8fbea7', - primary: '#8fbea7', + primary: '#448866', formBackground: '#f4f4f4', formHover: '#e8e8e8', grey: '#888888', diff --git a/net/web/src/session/Session.jsx b/net/web/src/session/Session.jsx index d5329287..f494c3ae 100644 --- a/net/web/src/session/Session.jsx +++ b/net/web/src/session/Session.jsx @@ -33,10 +33,12 @@ export function Session() { return ( { (viewport.state.display === 'xlarge') && ( -
+
- +
+ +
{ state.conversation && ( @@ -71,10 +73,12 @@ export function Session() {
)} { (viewport.state.display === 'large' || viewport.state.display === 'medium') && ( -
+
- +
+ +
@@ -107,7 +111,7 @@ export function Session() {
)} { (viewport.state.display === 'small') && ( -
+
diff --git a/net/web/src/session/Session.styled.js b/net/web/src/session/Session.styled.js index e8009690..2bb116a1 100644 --- a/net/web/src/session/Session.styled.js +++ b/net/web/src/session/Session.styled.js @@ -26,6 +26,10 @@ export const SessionWrapper = styled.div` flex-direction: column; position: relative; min-height: 0; + + .bottom { + height: calc(100% - 64px); + } } .center { flex-grow: 1; @@ -59,6 +63,10 @@ export const SessionWrapper = styled.div` flex-direction: column; position: relative; min-height: 0; + + .bottom { + height: calc(100% - 64px); + } } .center { flex-grow: 1; diff --git a/net/web/src/session/channels/Channels.jsx b/net/web/src/session/channels/Channels.jsx index ef236bdc..e2b6dcd4 100644 --- a/net/web/src/session/channels/Channels.jsx +++ b/net/web/src/session/channels/Channels.jsx @@ -3,6 +3,7 @@ import { ChannelsWrapper } from './Channels.styled'; import { SearchOutlined } from '@ant-design/icons'; import { useChannels } from './useChannels.hook'; import { ChannelItem } from './channelItem/ChannelItem'; +import { AddTopic } from './addTopic/AddTopic'; export function Channels() { @@ -10,19 +11,20 @@ export function Channels() { return ( -