diff --git a/src/common/component/ManageMembers.js b/src/common/component/ManageMembers.js index 7769bb4a..1eb7eb00 100644 --- a/src/common/component/ManageMembers.js +++ b/src/common/component/ManageMembers.js @@ -212,7 +212,7 @@ export default function ManageMembers({ cid = null }) { content={
  • }
  • - +
    {inputType == "password" ? ( @@ -92,7 +96,11 @@ export default function Input({ ) : prefix ? ( {prefix} - + ) : ( diff --git a/src/common/component/styled/Menu.js b/src/common/component/styled/Menu.js index 4461662b..d0176525 100644 --- a/src/common/component/styled/Menu.js +++ b/src/common/component/styled/Menu.js @@ -12,7 +12,7 @@ const StyledMenu = styled.ul` .item { display: flex; align-items: center; - justify-content: space-between; + gap: 14px; white-space: nowrap; cursor: pointer; @@ -23,13 +23,17 @@ const StyledMenu = styled.ul` font-size: 14px; line-height: 20px; color: #616161; + .icon { - width: 12px; - height: 12px; + width: 20px; + height: 20px; path { fill: #475467; } } + &.sb { + justify-content: space-between; + } &:hover { background-color: #22ccee; color: #fff; diff --git a/src/routes/chat/ChannelChat/index.js b/src/routes/chat/ChannelChat/index.js index 413f8f5a..c59c7ea6 100644 --- a/src/routes/chat/ChannelChat/index.js +++ b/src/routes/chat/ChannelChat/index.js @@ -1,5 +1,7 @@ import { useState, useEffect } from "react"; import { useDebounce } from "rooks"; +import { NavLink, useLocation } from "react-router-dom"; +import Tippy from "@tippyjs/react"; import { useDispatch, useSelector } from "react-redux"; import PinList from "./PinList"; import FavList from "../FavList"; @@ -28,8 +30,6 @@ import { StyledHeader, } from "./styled"; import InviteModal from "../../../common/component/InviteModal"; -import { NavLink, useLocation } from "react-router-dom"; -import Tippy from "@tippyjs/react"; export default function ChannelChat({ cid = "", dropFiles = [] }) { const [toolVisible, setToolVisible] = useState(""); diff --git a/src/routes/chat/ChannelList/index.js b/src/routes/chat/ChannelList/index.js index 8ff96405..3f680632 100644 --- a/src/routes/chat/ChannelList/index.js +++ b/src/routes/chat/ChannelList/index.js @@ -7,7 +7,7 @@ import NavItem from "./NavItem"; export default function ChannelList({ setDropFiles }) { const [currId, setCurrId] = useState(null); const { channelIds } = useSelector((store) => { - return { channelIds: store.channels.ids, channelData: store.channels.byId }; + return { channelIds: store.channels.ids }; }); const setRemoveChannel = (cid = undefined) => {