Merge branch 'master' of https://github.com/visuddhinanda/mint

app/guide/guide.css

@@ -24,7 +24,7 @@ guide ol {
 	padding-left: 20px;
 }
 .guide_contence {
-	border-top: 7px;
+	/*border-top: 7px;*/
 	position: absolute;
 	border: 1px solid var(--border-line-color);
 	border-radius: 5px;
@@ -39,9 +39,7 @@ guide ol {
 	font-size: 10pt;
 	text-align: left;
 	display: none;
-
-	margin: 0.3em;
-	margin: -1px 0px;
+	margin: 10px 0 0 0;
 	box-shadow: 0px 3px 13px 0px var(--shadow-color);
 	color: var(--main-color);
 	z-index: 200;
@@ -58,6 +56,12 @@ guide ol {
 	position: absolute;
 	top: -20px;
 }
+.left:after {
+	left: 10px;
+}
+.right:after {
+	right: 10px;
+}
 
 .guide_contence h1 {
 	font-size: 1.5em;

app/guide/guide.js

@@ -5,11 +5,11 @@ function guide_init() {
 				$(this).css("background", "unset");
 			}
 			if ($(this).offset().left < $(document.body).width() / 2) {
-				$(this).append('<div  class="guide_contence" style="left: -5px;"></div>');
-				$(".guide_contence:after").css("left", "0");
+				$(this).append('<div  class="guide_contence left" style="left: -5px;"></div>');
+				//$(".guide_contence:after").css("left", "0");
 			} else {
-				$(this).append('<div  class="guide_contence" style="right: -5px;"></div>');
-				$(".guide_contence:after").css("right", "0");
+				$(this).append('<div  class="guide_contence right" style="right: -5px;"></div>');
+				//$(".guide_contence:after").css("right", "0");
 			}
 			$(this).attr("init", "1");
 		}

app/pcdl/css/style.css

@@ -2700,7 +2700,7 @@ th {
 	border-radius: 6px;
 	z-index: 1;
 	opacity: 0;
-	transition: all 0.6s;
+	transition: all 0.4s;
 	white-space: nowrap;
 }
 

app/term/note.js

@@ -637,14 +637,14 @@ function note_json_html(in_json) {
 	output += "<span class='separate_line'></span>";
 
 	//手工义注
-	output += "<span class='other_bar'>";
+	output += "<span class='other_bar disable'>";
 	output +=
 		"<span class='other_tran_span commentray' title='📔" +
 		gLocal.gui.vannana +
 		"'>🪔" +
 		gLocal.gui.commentary +
 		"</span>";
-	output += "<span class='other_tran_num'></span>";
+	output += "<span class='other_comm_num'></span>";
 	output += "</span>";
 	output += "<span class='separate_line'></span>";
 
@@ -1009,7 +1009,7 @@ function render_one_sent_tran_a(iterator) {
 		if (typeof iterator.channalinfo == "undefined") {
 			html += "unkown";
 		} else {
-			html += "<a title='" + iterator.channalinfo.owner + "'>" + iterator.channalinfo.name + "@</a>";
+			html += "<a title='" + iterator.channalinfo.summary + "'>" + iterator.channalinfo.name + "@</a>";
 		}
 		html += "</span>";
 	} else {

app/term/term.css

@@ -854,6 +854,7 @@ span.keybutton {
 	padding: 0 3px;
 	color: white;
 	font-weight: 300;
+	height: fit-content;
 }
 
 #contents_view .focus {

app/term/term_edit_dlg.js

@@ -4,6 +4,7 @@ function term_edit_dlg_init(title = gLocal.gui.dict_terms) {
 	$("#term_edit_dlg").dialog({
 		autoOpen: false,
 		width: 550,
+		outerHeight: "80vh",
 		buttons: [
 			{
 				text: gLocal.gui.save,
@@ -95,22 +96,22 @@ function term_edit_dlg_render(word = "") {
 	output += "</fieldset>";
 
 	output += "<fieldset>";
-	output += "<legend>" + gLocal.gui.tag + "</legend>";
+	output += "<legend>" + gLocal.gui.language + "</legend>";
 	output +=
-		"<input type='input' id='term_edit_form_tag name='tag' name='tag' value='" +
-		word.tag +
+		"<input type='input' id='term_edit_form_language' name='language' value='" +
+		word.language +
 		"' placeholder=" +
-		gLocal.gui.optional +
+		gLocal.gui.required +
 		" >";
 	output += "</fieldset>";
 
 	output += "<fieldset>";
-	output += "<legend>" + gLocal.gui.language + "</legend>";
+	output += "<legend>" + gLocal.gui.tag + "</legend>";
 	output +=
-		"<input type='input' id='term_edit_form_language' name='language' value='" +
-		word.language +
+		"<input type='input' id='term_edit_form_tag name='tag' name='tag' value='" +
+		word.tag +
 		"' placeholder=" +
-		gLocal.gui.required +
+		gLocal.gui.optional +
 		" >";
 	output += "</fieldset>";
 
@@ -133,7 +134,6 @@ function term_edit_dlg_render(word = "") {
 		word.note +
 		"</textarea>";
 	output += "</fieldset>";
-
 	output += "</form>";
 
 	return output;

app/term/term_popup.js

@@ -10,17 +10,17 @@ function term_popup_init() {
         $(this).append(
           '<div term-popup="' +
             gid +
-            '"  class="guide_contence" style="left: -5px;"></div>'
+            '"  class="guide_contence left" style="left: -5px;"></div>'
         );
-        $(".guide_contence:after").css("left", "0");
+        //$(".guide_contence:after").css("left", "0");
       } else {
         //出现在右侧
         $(this).append(
           '<div term-popup="' +
             gid +
-            '" class="guide_contence" style="right: -5px;"></div>'
+            '" class="guide_contence right" style="right: -5px;"></div>'
         );
-        $(".guide_contence:after").css("right", "0");
+        //$(".guide_contence:after").css("right", "0");
       }
       $(this).attr("init", "1");
     }