From a1f8fc2fdf89ab50cd46c5ad96f7fe3dbc333756 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期一, 13 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TextbookReader

---
 src/assets/main.css |  151 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 117 insertions(+), 34 deletions(-)

diff --git a/src/assets/main.css b/src/assets/main.css
index f0291dd..492df2b 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -1,6 +1,6 @@
 @import './base.css';
 
-#app {
+#parentApp {
   width: 100%;
   height: 100%;
 }
@@ -27,87 +27,140 @@
 }
 ul {
   list-style: none;
-  padding:0;
+  padding: 0;
 }
-.hover{
+a {
+  text-decoration: none;
+  cursor: pointer;
+}
+.hover {
   cursor: pointer;
 }
 
+/* 璁剧疆 */
+.settingBox{
+  .inline{
+    display: flex;
+    justify-content: space-between;
+  }
+  .lineTypeBox{
+    width:190px;
+    padding:0 !important;
+    .typeItem{
+      line-height:16px;
+    }
+  }
+  .bgColor{
+    display: flex;
+    width: 190px;
+    .flex1 {
+      flex: 1;
+      .scribeItem {
+        width: 30px;
+        height: 30px;
+        border-radius: 5px;
+        border: 1px solid;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+  }
+}
 /* 鐢荤瑪宸ュ叿 */
-.popinnerBox .brush,.popinnerBox .write{
+.popinnerBox .brush {
   display: flex;
   padding: 10px 0;
 }
-.popinnerBox  .thickness {
+.popinnerBox .thickness {
   border-right: 1px solid #f3f3f3;
   width: 40px;
-  padding-right:10px;
+  padding-right: 10px;
   text-align: center;
-  
 }
 .popinnerBox .thickness .small {
   width: 7px;
   height: 7px;
   border-radius: 50%;
   background: #cccccc;
-  margin:0 auto;
+  margin: 0 auto;
 }
 .popinnerBox .thickness .middle {
   width: 10px;
   height: 10px;
   border-radius: 50%;
   background: #cccccc;
-  margin:0 auto;
-  margin-top:15px;
+  margin: 0 auto;
+  margin-top: 15px;
 }
 .popinnerBox .thickness .large {
   width: 13px;
   height: 13px;
   border-radius: 50%;
   background: #cccccc;
-  margin:0 auto;
-  margin-top:15px;
+  margin: 0 auto;
+  margin-top: 15px;
 }
 .popinnerBox .thickness .active {
   background: #0093ff;
 }
-.popinnerBox .lineStyle .lineTypeBox{
+.popinnerBox .characters {
+  width: 190px;
+  display: flex;
+  padding-right: 10px;
+  justify-content: space-between;
+}
+.popinnerBox .characters .small {
+  cursor: pointer;
+  text-align: center;
+  flex: 1;
+}
+.popinnerBox .characters .middle {
+  cursor: pointer;
+  text-align: center;
+  flex: 1;
+}
+.popinnerBox .characters .large {
+  cursor: pointer;
+  text-align: center;
+  flex: 1;
+}
+.lineStyle .lineTypeBox {
   display: flex;
   justify-content: space-between;
-  padding:0 10px;
+  padding: 0 10px;
 }
-.popinnerBox .lineStyle .lineTypeBox .typeItem{
-  flex:1;
-  padding:5px 20px;
+.lineStyle .lineTypeBox .typeItem {
+  flex: 1;
+  padding: 5px 20px;
   border-radius: 5px;
-  border: 1px solid #D9D9D9;
-  margin:0 5px;
+  border: 1px solid #d9d9d9;
+  margin: 0 5px;
   position: relative;
 }
-.popinnerBox .lineStyle .lineTypeBox .typeItem .solid{
+.lineStyle .lineTypeBox .typeItem .solid {
   border: 1px solid #707070;
   margin: 7px auto;
 }
-.popinnerBox .lineStyle .lineTypeBox .typeItem .dashed{
+.lineStyle .lineTypeBox .typeItem .dashed {
   border: 1px dashed #707070;
   margin: 7px auto;
 }
-.popinnerBox .lineStyle .lineTypeBox .lineTypeActive {
+.lineStyle .lineTypeBox .lineTypeActive {
   border: 1px solid #0093ff;
 }
-.popinnerBox .lineStyle .lineTypeBox .lineTypeActive .activeIcon{
-  width:12px;
-  height:11px;
-  background:#0093ff;
+.lineStyle .lineTypeBox .lineTypeActive .activeIcon {
+  width: 12px;
+  height: 11px;
+  background: #0093ff;
   border-radius: 5px 0 5px 0;
   position: absolute;
-  right:0;
+  right: 0;
   bottom: 0;
   display: flex;
-  justify-content:center;
+  justify-content: center;
   align-items: center;
 }
-
 
 .popinnerBox .colorSelectBox {
   padding: 0 10px;
@@ -118,7 +171,6 @@
 }
 .popinnerBox .colorSelectBox .flex1 {
   flex: 1;
-  
 }
 .popinnerBox .colorSelectBox .scribeItem {
   width: 18px;
@@ -131,12 +183,43 @@
   align-items: center;
 }
 
-.popinnerBox .cleanup,.popinnerBox .label{
+.popinnerBox .cleanup,
+.popinnerBox .label {
   display: flex;
   justify-content: space-between;
-  padding:10px 0
+  padding: 10px 0;
 }
-.popinnerBox .cleanup .cleanupItem,.popinnerBox .label .labelItem{
-  flex:1;
+.popinnerBox .cleanup .cleanupItem,
+.popinnerBox .label .labelItem {
+  flex: 1;
   text-align: center;
 }
+.popinnerBox .cleanup .cleanupItem img{
+  height:17px;
+  width:20px;
+}
+
+.el-input__inner {
+  border: none !important;
+}
+.el-button {
+  padding: 8px 15px !important;
+}
+
+.el-popper.is-light {
+  border: 1px solid #0093ff !important;
+}
+.el-popper.is-light .el-popper__arrow:before {
+  border: 1px solid #0093ff !important;
+}
+
+.el-tree {
+  background: none !important;
+}
+.el-tree-node:focus > .el-tree-node__content,
+.el-tree-node__content:hover {
+  background: rgba(0, 147, 255, 0.21) !important;
+}
+.el-tree-node__content {
+  height: 30px !important;
+}

--
Gitblit v1.9.1