Merge pull request #1851 from nervosnetwork/develop

Merge develop into testnet

src/components/Header/MenusComp/icons/index.tsx

@@ -0,0 +1,10 @@
+import { ReactComponent as Home } from './Home.svg'
+import { ReactComponent as NervosDao } from './NervosDao.svg'
+import { ReactComponent as Assets } from './Assets.svg'
+import { ReactComponent as RGBPP } from './Rgbpp.svg'
+import { ReactComponent as Charts } from './Charts.svg'
+import { ReactComponent as Fiber } from './Fiber.svg'
+import { ReactComponent as Faucet } from './Faucet.svg'
+import { ReactComponent as FeeRate } from './FeeRate.svg'
+
+export { Fiber, NervosDao, RGBPP, Faucet, Charts, Home, Assets, FeeRate }

src/components/Header/MenusComp/index.module.scss

@@ -1,19 +1,48 @@
 .submenu {
-  padding: 4px 12px;
-  border-radius: 4px;
+  --dim-color: rgb(244 244 245);
+
   background: #fff;
   color: #333;
   box-shadow: 0 4px 4px 0 rgb(16 16 16 / 5%);
+  border-radius: 4px;
+  overflow: hidden;
 
   .link {
-    display: block;
-    padding: 12px 0;
-    border-top: 1px solid #e5e5e5;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    gap: 4px;
+    padding: 8px 20px;
     line-height: 1;
+    margin: 4px;
+    border-radius: 4px;
 
-    &:first-child {
-      border-top: 0;
+    &:hover {
+      background: var(--dim-color);
     }
+
+    &[data-is-inset='true'] {
+      padding-left: 28px;
+    }
+
+    .hot {
+      width: 14px;
+      height: 10px;
+      object-fit: cover;
+      margin-bottom: 4px;
+    }
+  }
+
+  .label {
+    font-weight: bold;
+    font-size: 1.2em;
+    margin: 4px;
+    padding: 8px 20px 2px;
+  }
+
+  .separator {
+    height: 1px;
+    background: var(--dim-color);
   }
 }
 
@@ -68,7 +97,7 @@
   color: white;
   display: flex;
   align-items: center;
-  margin-right: 56px;
+  margin-right: 50px;
   font-size: 14px;
   font-weight: regular;
 
@@ -77,11 +106,12 @@
   }
 
   @media (width <= 1200px) {
-    margin-right: 20px;
+    margin-right: 16px;
   }
 
-  @media (width >= 1024px) and (width <= 1044px) {
-    margin-right: calc(56px - ((1440px - 100vw) * calc((56 - 8) / (1440 - 1024))));
+  svg:hover {
+    filter: drop-shadow(0 0 4px var(--primary-color));
+    mix-blend-mode: difference;
   }
 
   &:hover {