Merge pull request #615 from bhikkhu-kosalla-china/master

词典搜索框固定

app/article/style.css

@@ -43,6 +43,7 @@
 	/*max-width: 1280px;*/
 	/*margin-left: 270px;*/
 	margin-right: auto;
+	transition: all 0.5s ease;
 }
 
 #left_pannal_inner {
@@ -52,8 +53,8 @@
     padding-top: 90px;
     height: 100%;
 	/*width:300px;*/
-	overflow-x: hidden;
-	overflow-x: scroll;
+	/*overflow-x: hidden;*/
+	overflow: scroll;
 }
 
 #toc_content{
@@ -62,7 +63,8 @@
 	max-width:calc(20vw - 24px);
 	background-color: var(--bg-color);
     border-bottom: 1px solid var(--border-line-color);
-	overflow-y: scroll;
+	overflow-y: unset;
+	transition: all 0.5s ease;
 }
 
 .fun_frame {
@@ -70,6 +72,7 @@
 	margin-right: 10px;
 	margin-bottom: 10px;
 	width: calc(30% - 1em)
+	transition: all 0.5s ease;
 }
 .fun_frame .title {
 	padding: 6px;

app/dict/css/style.css

@@ -11,7 +11,7 @@ body {
 	padding: 0.6em 1em 0.1em 1em;
 	background-color: var(--tool-bg-color1);
 	border-bottom: none;
-	position: fixed;
+	/*position: fixed;*/
     width: 100%;
 }
 
@@ -130,6 +130,8 @@ body {
 .pre_serach_block {
 	border-bottom: 1px solid var(--shadow-color);
 	padding: 5px 0;
+	height: 60vh;
+    overflow: scroll;
 }
 
 .pre_serach_block_title {
@@ -207,9 +209,12 @@ input[type="submit"] {
 }
 
 #pre_search_result {
-	background-color: var(--bg-color);
+	background-color: silver;
 	z-index: 50;
 	display: none;
+	max-width: 1024px;
+	position: fixed;
+	color:black;
 }
 
 #dt_title {

app/dict/grm_abbr.php

@@ -63,6 +63,7 @@ define("GRM_ABBR",[
 	["dictid"=>19,"abbr"=>"pron．","replace"=>"pron"],
 	["dictid"=>1,"abbr"=>"pron．","replace"=>"pron"],
 	["dictid"=>8,"abbr"=>"pron．","replace"=>"pron"],
+	["dictid"=>18,"abbr"=>"pron．","replace"=>"pron"],
 	["dictid"=>6,"abbr"=>"pron.","replace"=>"pron"],
 	["dictid"=>32,"abbr"=>"pron.","replace"=>"pron"],
 	["dictid"=>15,"abbr"=>"Vism．","replace"=>"vism"],
@@ -334,27 +335,65 @@ define("GRM_ABBR",[
 	["dictid"=>18,"abbr"=>"Sk．","replace"=>"sk"],
 	["dictid"=>4,"abbr"=>"（梵","replace"=>"bsk"],
 	["dictid"=>6,"abbr"=>"（梵","replace"=>"bsk"],
+	["dictid"=>1,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>1,"abbr"=>"a．","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>3,"abbr"=>"a．","replace"=>"adj"],
+	["dictid"=>8,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>8,"abbr"=>"a．","replace"=>"adj"],
+	["dictid"=>6,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>6,"abbr"=>"a．","replace"=>"adj"],
+	["dictid"=>15,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>15,"abbr"=>"a．","replace"=>"adj"],
+	["dictid"=>18,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>18,"abbr"=>"a．","replace"=>"adj"],
+	["dictid"=>19,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>19,"abbr"=>"a．","replace"=>"adj"],
 	["dictid"=>32,"abbr"=>"a.","replace"=>"adj"],
+	["dictid"=>32,"abbr"=>"a．","replace"=>"adj"],
 	["dictid"=>1,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>8,"abbr"=>"f．","replace"=>"f"],
 	["dictid"=>3,"abbr"=>"f．","replace"=>"f"],
-	["dictid"=>6,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>8,"abbr"=>"f．","replace"=>"f"],
 	["dictid"=>6,"abbr"=>"f．","replace"=>"f"],
 	["dictid"=>15,"abbr"=>"f．","replace"=>"f"],
 	["dictid"=>18,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>19,"abbr"=>"f．","replace"=>"f"],
+	["dictid"=>1,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>3,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>6,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>8,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>15,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>18,"abbr"=>"f.","replace"=>"f"],
+	["dictid"=>19,"abbr"=>"f.","replace"=>"f"],
 	["dictid"=>32,"abbr"=>"f.","replace"=>"f"],
 	["dictid"=>1,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>8,"abbr"=>"m．","replace"=>"m"],
 	["dictid"=>3,"abbr"=>"m．","replace"=>"m"],
-	["dictid"=>6,"abbr"=>"m.","replace"=>"m"],
 	["dictid"=>6,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>8,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>10,"abbr"=>"m．","replace"=>"m"],
 	["dictid"=>18,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>19,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>32,"abbr"=>"m．","replace"=>"m"],
+	["dictid"=>1,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>3,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>6,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>8,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>10,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>18,"abbr"=>"m.","replace"=>"m"],
+	["dictid"=>19,"abbr"=>"m.","replace"=>"m"],
 	["dictid"=>32,"abbr"=>"m.","replace"=>"m"],
 	["dictid"=>1,"abbr"=>"n．","replace"=>"nt"],
-	["dictid"=>8,"abbr"=>"n．","replace"=>"nt"],
-	["dictid"=>6,"abbr"=>"n.","replace"=>"nt"],
 	["dictid"=>6,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>8,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>10,"abbr"=>"n．","replace"=>"nt"],
 	["dictid"=>18,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>19,"abbr"=>"n．","replace"=>"nt"],
+	["dictid"=>1,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>6,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>8,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>10,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>18,"abbr"=>"n.","replace"=>"nt"],
+	["dictid"=>19,"abbr"=>"n.","replace"=>"nt"],
 	["dictid"=>6,"abbr"=>"子音","replace"=>"consonant"],
 	["dictid"=>32,"abbr"=>"子音","replace"=>"consonant"]	
 	]);

app/dict/index.php

@@ -125,7 +125,7 @@ guide.grammar_tag:hover {
 		</button>
 	</div>
 
-	<div style="margin-top:calc(39px + 0.6em);">
+	<div style="position: fixed;max-height: calc(100vh - 89px - 3.6em);width:100vw;overflow: scroll;">
 		<div id="main_view" class='section_inner' >
 			<div id='dict_list_shell' style="display:none" onclick='setNaviVisibility()'>
 				<div id='dict_list' class='dict_list_off'></div>

app/pcdl/css/style.css

@@ -3089,6 +3089,8 @@ th {
 	color: #b5b5b5;
 	position: absolute;
 	width: 100%;
+	height: 5em;
+	bottom: -2em;
 }
 
 #search_div {

app/studio/css/color_day.css

@@ -1,5 +1,8 @@
 :root {
+	--bg-color: #ffffff;
     --main-color: #1E1E1E;
+	--main-color1: #626262;
+	--main-color1: #626262;
     --detail-color: #626262;
     --tool-title-color: #1B1C1C;
     --tool-color: #FFFFFF;

app/studio/index.php

@@ -34,6 +34,7 @@ else{
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link type="text/css" rel="stylesheet" href="css/style.css"/>
 	<link type="text/css" rel="stylesheet" href="css/color_day.css" id="colorchange" />
+	<link type="text/css" rel="stylesheet" href="../pcdl/css/color_day.css" id="colorchange" />
 	<title><?php echo $_local->gui->pcd_studio; ?></title>
 	<script language="javascript" src="js/common.js"></script>
 	<script language="javascript" src="js/index_mydoc.js"></script>

app/users_guide/zh-cn/grammar_f.md

@@ -1,14 +1,14 @@
 # 阴性
-**名词**、**三性词**所具有的属性之一：
+**名词**、**三性词**所具有的属性之一，谓语动词和不变词不具有性：
 - 其中**名词**的**性**是相对固定的
-- 而**三性词**的**性**不固定跟随其修饰的**中心语**的**性**。
+- 而**三性词**的**性**不固定，它**性**跟随其修饰的**中心语**的**性**。
 
->如果在**单词**的词条解释中出现，则代表该**单词**为**名词**
+>如果在**单词**的词条解释中出现下表中代表**阴性**字样，则代表该**单词**为**名词**
 
->如果在**语尾**的词条解释中出现，则代表该**语尾**有应用在**阴性词**中的可能性
+>如果在**语尾**的词条解释中出现下表中代表**阴性**字样，则代表该**语尾**有应用在**阳性词**中的可能性
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利|thī|itthi<br>itthiliṅga<br>thīliṅga|
-|汉|阴|阴性|
-|英|f.|Feminine|
+|巴利|**thī**|itthi<br>itthiliṅga<br>thīliṅga|
+|汉|**阴**|**阴性**|
+|英|**f.**|Feminine|

app/users_guide/zh-cn/grammar_m.md

@@ -1,14 +1,14 @@
 # 阳性
-**名词**、**三性词**所具有的属性之一：
+**名词**、**三性词**所具有的属性之一，谓语动词和不变词不具有性：
 - 其中**名词**的**性**是相对固定的
-- 而**三性词**的**性**不固定跟随其修饰的**中心语**的**性**。
+- 而**三性词**的**性**不固定，它**性**跟随其修饰的**中心语**的**性**。
 
->如果在**单词**的词条解释中出现，则代表该**单词**为**名词**
+>如果在**单词**的词条解释中出现下表中代表**阳性**字样，则代表该**单词**为**名词**
 
->如果在**语尾**的词条解释中出现，则代表该**语尾**有应用在**阳性词**中的可能性
+>如果在**语尾**的词条解释中出现下表中代表**阳性**字样，则代表该**语尾**有应用在**阳性词**中的可能性
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利|pu|puma<br>pumaliṅga<br>pulliṅga|
-|汉|阳|阳性|
-|英|m.|masculine|
+|巴利|**pu**|puma<br>pumaliṅga<br>pulliṅga|
+|汉|**阳**|**阳性**|
+|英|**m.**|masculine|

app/users_guide/zh-cn/grammar_nt.md

@@ -1,15 +1,15 @@
 # 中性
-**名词**、**三性词**所具有的属性之一：
+**名词**、**三性词**所具有的属性之一，谓语动词和不变词不具有性：
 - 其中**名词**的**性**是相对固定的
-- 而**三性词**的**性**不固定跟随其修饰的**中心语**的**性**。
+- 而**三性词**的**性**不固定，它**性**跟随其修饰的**中心语**的**性**。
 
->如果在**单词**的词条解释中出现，则代表该**单词**为**名词**
+>如果在**单词**的词条解释中出现下表中代表**中性**字样，则代表该**单词**为**名词**
 
->如果在**语尾**的词条解释中出现，则代表该**语尾**有应用在**中性词**中的可能性
+>如果在**语尾**的词条解释中出现下表中代表**中性**字样，则代表该**语尾**有应用在**阳性词**中的可能性
 
 
 |语种|缩写|全称|
 |-|-|-|
-|巴利|na|napuṃsaka<br>napuṃsakaliṅga|
-|汉|中|中性|
-|英|nt.<br>n.|Neutral|
+|巴利|**na**|napuṃsaka<br>napuṃsakaliṅga|
+|汉|**中**|**中性**|
+|英|**nt.**<br>**n.**|Neutral|

app/users_guide/zh-cn/grammar_pl.md

@@ -1,7 +1,10 @@
 # 复数
 
-缩写： pl.
-pāḷi：bahuvacana
-
 > Bahūnamatthānaṃ vacanaṃ bahuvacanaṃ.
 > 表达“有多个”含义的用语，为复数。
+
+|语种|缩写|全称|
+|-|-|-|
+|巴利|**bahu**|bahuvacana|
+|汉|**复**|**复数**|
+|英|**pl.**<br>**p.**|plural|

app/users_guide/zh-cn/grammar_prp.md

@@ -1,7 +1,9 @@
 ## 现在分词
 
+- 有两种
+
 |语种|缩写|全称|
 |-|-|-|
-|巴利|——|——|
+|巴利|——|mānanta|
 |汉|**现分**|现在分词|
 |英|**prp.**<br>**pr.p.**<br>**ppr.**|Present Participle<br>|

app/users_guide/zh-cn/grammar_sg.md

@@ -1,6 +1,10 @@
 # 单数
-pāḷi：ekavacana
-```
-ekassatthassa vacanaṃ ekavacanaṃ.——“Saddanītippakaraṇaṃ”
-表示“一个”含义的用语，为单数。——《论语法》
-```
+
+>ekassatthassa vacanaṃ ekavacanaṃ.——“Saddanītippakaraṇaṃ”
+>表示“一个”含义的用语，为单数。——《论语法》
+
+|语种|缩写|全称|
+|-|-|-|
+|巴利|**eka**|ekavacana|
+|汉|**单**|**单数**|
+|英|**sg.**<br>**s.**|singular|