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

.gitignore

@@ -13,13 +13,6 @@
 /package-lock.json
 /yarn.lock
 /composer.lock
-/app/phpinfo.php
-/app/config.php
-/app/config.js
-/app/path.php
-
-.env
-
 # dependencies
 /vendor/
 /node_modules/

app/.gitignore

@@ -1,2 +1,5 @@
 # misc
-/phpinfo.php
+/phpinfo.php
+/path.php
+/config.php
+/config.js

app/article/index.php

@@ -367,8 +367,8 @@ function set_toc_visible(isVisible){
 				</div>
 			</div>
 		</div>
-		<div id="right_pannal">
-			<div class="fun_frame" style="overflow-x: scroll;position: fixed;width: 18%;height: calc(100vh - 250px);">
+		<div id="right_pannal" style="max-width: unset;">
+			<div class="fun_frame" style="position: fixed;width: auto;height: calc(100vh - 250px);display: grid;">
 				<div style="display:flex;justify-content: space-between;">
 					<div class="title"><?php echo $_local->gui->contributor; ?></div>
 					<div class="click_dropdown_div">
@@ -379,7 +379,7 @@ function set_toc_visible(isVisible){
 					<button onclick='onChannelChange()'><?php echo $_local->gui->confirm; ?></button>
 					<button onclick='onChannelMultiSelectCancel()'><?php echo $_local->gui->cancel; ?></button>
 				</div>
-				<div id="channal_list" class="content" style="max-height:calc(100vh - 20em);">
+				<div id="channal_list" class="content" style="max-height:calc(100vh - 300px);">
 				</div>
 			</div>
 		</div>
@@ -473,4 +473,4 @@ function GetPageScroll()
 <div id="model_win" class="model_win_container"></div>
 
 </body>
-</html>
+</html>

app/article/mobile.css

@@ -19,6 +19,7 @@
 
 #main_view {
 	padding-top: 10em;
+	margin: 0;
 }
 .other_tran_div > .tool_bar {
 }

app/article/my_article.js

@@ -194,12 +194,12 @@ function my_article_edit(id) {
 					html += "<div>";
 
 					html += "<div style='display:flex;'>";
-					html += "<span style='flex:1;'>" + gLocal.gui.title + "</span>";
+					html += "<span style='flex:1;margin: auto;'>" + gLocal.gui.title + "</span>";
 					html += '<span id="article_title" style="flex:7;"></span>';
 					html += "</div>";
 
 					html += "<div style='display:flex;'>";
-					html += "<span style='flex:1;'>" + gLocal.gui.sub_title + "</span>";
+					html += "<span style='flex:1;margin: auto;'>" + gLocal.gui.sub_title + "</span>";
 					html += '<span id="article_title" style="flex:7;">';
 					if(!result.subtitle){
 						result.subtitle="";
@@ -210,9 +210,8 @@ function my_article_edit(id) {
 
 					html += "<div id='channal_selector' form_name='channal' style='display:none;'></div>";
 					html += "<div style='display:flex;'>";
-					html += "<span style='flex:1;'>" + gLocal.gui.status + "</span>";
-					html += '<span id="aritcle_status" style="flex:7;"></span>';
-					html += "</div>";
+					html += "<span style='flex:1;margin: auto;'>" + gLocal.gui.status + "</span>";
+					html += '<span id="aritcle_status" style="flex:1;"></span>';
 
 					let lang;
 					if(typeof result.lang == "undefined"){
@@ -222,12 +221,12 @@ function my_article_edit(id) {
 						lang = result.lang;
 					}
 					 
-					html += '<div style="width:100%;display:flex;" >';
+					//html += '<div style="width:100%;display:flex;" >';
 					html +=
-						'<span style="flex:1;margin: auto;">' +
+						'<span style="flex:2;margin: auto;text-align: center;">' +
 						gLocal.gui.language_select +
 						'</span>';
-					html +='<input id="article_lang_select"  style="flex:7;width:100%;" type="input" onchange="article_lang_change()"  placeholder="' +
+					html +='<input id="article_lang_select"  style="flex:4;width:100%;" type="input" onchange="article_lang_change()"  placeholder="' +
 						gLocal.gui.input +
 						" & " +
 						gLocal.gui.language_select +
@@ -239,7 +238,8 @@ function my_article_edit(id) {
 						lang +
 						'" >';
 					html +=' <input id="article_lang" type="hidden" name="lang" value="'+lang+'">';
-					html +='</div>';
+					//html +='</div>';
+					html += "</div>";
 
 					html += "<div style='display:flex;'>";
 					html += "<span style='flex:1;margin:auto;'>" + gLocal.gui.introduction + "</span>";
@@ -248,7 +248,7 @@ function my_article_edit(id) {
 					html += "</div>";
 
 					html +=
-						"<textarea id='article_content' name='content' style='height:480px;resize: vertical;'>" +
+						"<textarea id='article_content' name='content' style='height:calc(100vh - 7em - 220px);resize: vertical;'>" +
 						result.content +
 						"</textarea>";
 					html += "</div>";

app/article/my_article_edit.php

@@ -41,7 +41,7 @@ require_once '../studio/index_head.php';
 	.file_list_block {
     max-width: 100%;
 	margin-right: 1em;
-	max-height: 85vh;
+	height: calc(100vh - 7em);
 	}
 	.index_inner {
     margin-left: 16em;
@@ -50,8 +50,8 @@ require_once '../studio/index_head.php';
 #preview_div {
     flex: 6;
     overflow-y: scroll;
-	height: 550px;
-	max-height: 75vh;
+	height: calc(100vh - 7em - 60px);
+	
 }
 #preview_inner{
 	background-color: var(--bg-color);
@@ -153,7 +153,7 @@ require_once '../studio/index_head.php';
 				</span>	
 			</div>
 		</div>
-		<div id="article_list"  class="file_list_block" style="">
+		<div id="article_list" style="">
 
 		</div>
 

app/article/style.css

@@ -167,8 +167,8 @@
 	display: block;
 }
 img {
-	width: 90vw;
-	max-width: 15vw;
+	width: 40%;
+	/*max-width: 40%;*/
 }
 
 /*

app/term/note.js

@@ -82,7 +82,7 @@ function note_init(input,channel="",editor="",lang="en") {
 
 		output += "</div>";
 
-		let newString = output.replace(/\{\{/g, '<span class="note_shell"><note info="');
+		let newString = output.replace(/\{\{/g, '<span class="note_shell"><note style="border: solid 2px var(--btn-bg-color);" info="');
 		newString = newString.replace(/\}\}/g, '" ></note></span>');
 
 		return newString;