fix: 后台滚动条样式不美观&编辑器页面不该出现的滚动条

Mereithhh · Aug 31, 2022 · a1d8530 · a1d8530
1 parent 4f17152
commit a1d8530
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 42 deletions.
diff --git a/packages/admin/src/global.less b/packages/admin/src/global.less
@@ -162,24 +162,7 @@ body .bytemd {
 .ant-tooltip  {
   z-index: 10000;
 }
-// 217.5 (7) 179 48
-/* 滚动槽 */
-::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
-  // border-radius: 4px;
-}
-::-webkit-scrollbar-track {
-  border-radius: 2px;
-  background: rgba(0, 0, 0, 0.06);
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.08);
-}
-/* 滚动条滑块 */
-::-webkit-scrollbar-thumb {
-  border-radius: 2px;
-  background: #f5f5f5;
-  -webkit-box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.2);
-}
+
 body .ant-page-header-heading-title {
   overflow: auto;
   text-overflow: unset;
@@ -197,3 +180,19 @@ body .ant-page-header-heading-title {
     background-color: #f5f5f5;
   }
 }
+/* 滚动槽 */
+::-webkit-scrollbar {
+  width: 10px;
+  height: 6px;
+  // border-radius: 4px;
+}
+::-webkit-scrollbar-track {
+  border-radius: 2px;
+  background: rgba(0, 0, 0, 0.06);
+}
+/* 滚动条滑块 */
+::-webkit-scrollbar-thumb {
+  border-radius: 2px;
+  background: #d7d7d7;
+
+}
diff --git a/packages/admin/src/pages/Editor/index.jsx b/packages/admin/src/pages/Editor/index.jsx
@@ -289,26 +289,30 @@ export default function () {
       }}
       footer={null}
     >
-      <Editor
-        loading={loading}
-        setLoading={setLoading}
-        value={value}
-        onChange={(val) => {
-          setValue(val);
-          window.localStorage.setItem(key, val);
-        }}
-      />
-      <Upload
-        showUploadList={false}
-        multiple={false}
-        accept={'.md'}
-        beforeUpload={handleImport}
-        style={{ display: 'none' }}
-      >
-        <a key="importBtn" type="link" style={{ display: 'none' }} id="importBtn">
-          导入内容
-        </a>
-      </Upload>
+      <div style={{ height: '100%' }}>
+        <div style={{ height: '0' }}>
+          <Upload
+            showUploadList={false}
+            multiple={false}
+            accept={'.md'}
+            beforeUpload={handleImport}
+            style={{ display: 'none', height: 0 }}
+          >
+            <a key="importBtn" type="link" style={{ display: 'none' }} id="importBtn">
+              导入内容
+            </a>
+          </Upload>
+        </div>
+        <Editor
+          loading={loading}
+          setLoading={setLoading}
+          value={value}
+          onChange={(val) => {
+            setValue(val);
+            window.localStorage.setItem(key, val);
+          }}
+        />
+      </div>
     </PageContainer>
   );
 }
diff --git a/packages/website/styles/scrollbar.css b/packages/website/styles/scrollbar.css
@@ -6,14 +6,12 @@
   width: 10px;
 }
 .dark #toc-container::-webkit-scrollbar-thumb {
-  background: #898989;
+  background: #797979;
 }
 .dark ::-webkit-scrollbar-thumb {
   background: #9f9f9f;
 }
 /* 滚动条滑块 */
 ::-webkit-scrollbar-thumb {
-  /* border-radius: 4px; */
-  background: #ebebeb;
-  -webkit-box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.2);
+  background: #dadada;
 }