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

app/pcdl/head_bar.php

@@ -19,10 +19,10 @@
 		box-sizing: border-box;
 	}
 
-    body{
-        padding-top: 50px;
+	body {
+		padding-top: 50px;
 	}
-	
+
 	nav a,
 	nav a:link,
 	nav a:visited {
@@ -41,7 +41,7 @@
 		height: 50px;
 		z-index: 900;
 		width: 100%;
-		top:0;
+		top: 0;
 	}
 
 	header label {
@@ -70,9 +70,14 @@
 		transition: all ease 300ms;
 	}
 
+	.platform-toggle::before {
+		content: '<?php echo $_local->gui->library; ?>';
+	}
+
 	.platform-toggle a {
 		color: white;
 		transition: color ease 300ms;
+		display: none;
 	}
 
 	.goto-platform {
@@ -86,16 +91,6 @@
 		padding: 0;
 	}
 
-	.platform-toggle:hover .goto-platform {
-		cursor: pointer;
-		transform: scaleX(1);
-		opacity: 1;
-	}
-
-	.platform-toggle:hover a {
-		color: var(--new-tool-content-disabled);
-	}
-
 	.platform-toggle::after {
 		content: '';
 		background-image: linear-gradient(to right, var(--new-tool-bg), var(--new-tool-btn));
@@ -109,9 +104,7 @@
 		transition: transform ease 300ms;
 	}
 
-	.platform-toggle:hover::after {
-		transform: scaleX(1);
-	}
+
 
 	nav {
 		position: absolute;
@@ -143,7 +136,8 @@
 		border-radius: 3px;
 		margin: 0 2px;
 	}
-/*
+
+	/*
 	.icon_btn:hover {
 		padding: 0.3em 0.3em;
 		background-color: var(--new-tool-list-hover-bg);
@@ -308,8 +302,8 @@
 		display: none;
 	}
 
-	.icon{
-		fill:var(--new-tool-btn);
+	.icon {
+		fill: var(--new-tool-btn);
 	}
 
 	/* 当下拉内容显示后修改下拉按钮的背景颜色 */
@@ -350,20 +344,20 @@
 			display: none;
 		}
 
-		header {
+		/*header {
 			display: grid;
 			grid-template-columns: 1fr auto 1fr auto 1fr;
 			padding: 0 1rem;
-		}
+		}*/
 
-		.head-logo {
-			grid-column: 1;
-			justify-content: left;
+		header {
+			display: flex;
+			justify-content: space-between;
+			padding: 0 1rem;
 		}
 
 		nav {
 			all: unset;
-			grid-column: 3;
 			display: flex;
 			align-items: center;
 			height: 50px;
@@ -395,6 +389,28 @@
 			display: block;
 		}
 
+		.platform-toggle a {
+			display:block;
+		}
+
+		.platform-toggle::before{
+			display:none;
+		}
+
+		.platform-toggle:hover .goto-platform {
+			cursor: pointer;
+			transform: scaleX(1);
+			opacity: 1;
+		}
+
+		.platform-toggle:hover a {
+			color: var(--new-tool-content-disabled);
+		}
+
+		.platform-toggle:hover::after {
+			transform: scaleX(1);
+		}
+
 		.platform-content {
 			top: unset;
 			position: relative;
@@ -422,6 +438,11 @@
 		.header-dropdown-content li div {
 			padding: 0.7rem;
 		}
+
+		.nav-right{
+			position:relative;
+			margin: 0;
+		}
 	}
 </style>
 

app/ucenter/user.php

@@ -7,19 +7,17 @@
 	}
 </script>
 <style>
-	#user_info {
-		width: 20em;
-	}
-
 	#user_info_welcome {
 		color: var(--main-color);
 		border-bottom: 1px solid var(--tool-line-color);
+		border-radius: 3px 3px 0 0;
 		padding: 10px;
 		background-color: var(--bg-color);
 	}
 
 	#user_info_name {
 		font-size: 200%;
+		margin: 0.1em;
 	}
 
 	#user_info_welcome2 {
@@ -85,7 +83,7 @@
 				<div id="user_info_name"><?php echo $_COOKIE["nickname"]; ?></div>
 				<div id="user_info_welcome2"><?php echo $_local->gui->to_the_dhamma; ?></div>
 			</div>
-			<div style="padding:10px;">
+			<div style="padding:10px; white-space:nowrap;">
 				<a href="../ucenter/setting.php" target="_blank">
 					<span>
 						<svg class="icon">