diff --git a/public/index.html b/public/index.html
index 7bca5d3b..efd50cd3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -58,7 +58,7 @@
* {
overflow: visible;
border: none;
- /* outline: none; */
+ outline: none;
padding: 0;
margin: 0;
box-sizing: border-box;
diff --git a/src/routes/chat/ChannelChat/index.js b/src/routes/chat/ChannelChat/index.js
index 1eb717cc..32039114 100644
--- a/src/routes/chat/ChannelChat/index.js
+++ b/src/routes/chat/ChannelChat/index.js
@@ -11,10 +11,10 @@ import Layout from "../Layout";
import { renderMessageFragment } from "../utils";
import EditIcon from "../../../assets/icons/edit.svg";
// import alertIcon from "../../../assets/icons/alert.svg?url";
-import peopleIcon from "../../../assets/icons/people.svg?url";
-import pinIcon from "../../../assets/icons/pin.svg?url";
+import IconPeople from "../../../assets/icons/people.svg";
+import IconPin from "../../../assets/icons/pin.svg";
// import searchIcon from "../../../assets/icons/search.svg?url";
-import headphoneIcon from "../../../assets/icons/headphone.svg?url";
+import IconHeadphone from "../../../assets/icons/headphone.svg";
import boardosIcon from "../../../assets/icons/app.boardos.svg?url";
import webrowseIcon from "../../../assets/icons/app.webrowse.svg?url";
import addIcon from "../../../assets/icons/add.svg?url";
@@ -94,7 +94,7 @@ export default function ChannelChat({ cid = "", dropFiles = [] }) {
*/}
-
+
{/*
@@ -124,16 +124,21 @@ export default function ChannelChat({ cid = "", dropFiles = [] }) {
content={}
>
0 ? "badge" : ""}`}
+ className={`tool ${pinCount > 0 ? "badge" : ""} ${
+ toolVisible == "pin" ? "active" : ""
+ } `}
data-count={pinCount}
>
-
+
-
+
-
+
diff --git a/src/routes/chat/ChannelList/NavItem.js b/src/routes/chat/ChannelList/NavItem.js
index da097f0a..65b391f4 100644
--- a/src/routes/chat/ChannelList/NavItem.js
+++ b/src/routes/chat/ChannelList/NavItem.js
@@ -8,6 +8,8 @@ import useContextMenu from "../../../common/hook/useContextMenu";
import ContextMenu from "../../../common/component/ContextMenu";
import InviteModal from "../../../common/component/ChannelInviteModal";
import Tooltip from "../../../common/component/Tooltip";
+import IconSetting from "../../../assets/icons/setting.svg";
+import IconInvite from "../../../assets/icons/invite.from.channel.svg";
// import { useDebounce} from "rooks";
import { useReadMessageMutation } from "../../../app/services/message";
import { useUpdateMuteSettingMutation } from "../../../app/services/contact";
@@ -161,19 +163,19 @@ const NavItem = ({ id, setFiles, toggleRemoveConfirm }) => {
{inviteIconVisible && (
-
+ >
)}
-
+ >
{unreads > 0 && (
diff --git a/src/routes/chat/ChannelList/styled.js b/src/routes/chat/ChannelList/styled.js
index 2aab7a9a..3b220831 100644
--- a/src/routes/chat/ChannelList/styled.js
+++ b/src/routes/chat/ChannelList/styled.js
@@ -1,7 +1,6 @@
import styled from "styled-components";
import { NavLink } from "react-router-dom";
-import settingIcon from "../../../assets/icons/setting.svg?url";
-import inviteIcon from "../../../assets/icons/invite.from.channel.svg?url";
+
const Styled = styled(NavLink)`
position: relative;
display: flex;
@@ -40,13 +39,8 @@ const Styled = styled(NavLink)`
display: flex;
width: 16px;
height: 16px;
- background-size: contain;
-
- &.setting {
- background-image: url(${settingIcon});
- }
- &.invite {
- background-image: url(${inviteIcon});
+ &:hover path {
+ fill: #667085;
}
}
> .badge {
diff --git a/src/routes/chat/Layout/styled.js b/src/routes/chat/Layout/styled.js
index 8700e286..9bea55a0 100644
--- a/src/routes/chat/Layout/styled.js
+++ b/src/routes/chat/Layout/styled.js
@@ -6,7 +6,7 @@ const Styled = styled.article`
border-top-right-radius: 16px;
border-bottom-right-radius: 16px;
> .head {
- box-sizing: content-box;
+ box-sizing: border-box;
height: 56px;
padding: 0 20px;
/* box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.1); */
@@ -67,6 +67,12 @@ const Styled = styled.article`
.tool {
position: relative;
cursor: pointer;
+ &.active svg path {
+ fill: #3f3f46;
+ }
+ &:not(.active):hover svg path {
+ fill: #51525c;
+ }
&.badge:after {
position: absolute;
top: -8px;
diff --git a/src/routes/home/Menu.js b/src/routes/home/Menu.js
index 0223de32..916d3785 100644
--- a/src/routes/home/Menu.js
+++ b/src/routes/home/Menu.js
@@ -35,12 +35,12 @@ export default function Menu() {
const { pathname } = useLocation();
return (
-
-
-
+
+
+
-
-
+
+
{/* {expand && (
Settings
diff --git a/src/routes/home/index.js b/src/routes/home/index.js
index 0986b9ff..34c1a7c7 100644
--- a/src/routes/home/index.js
+++ b/src/routes/home/index.js
@@ -46,7 +46,7 @@ export default function HomePage() {
-