0.923

solstice23 · Apr 1, 2020 · 4fed4df · 4fed4df
1 parent 4a049ff
commit 4fed4df
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -65,6 +65,10 @@ Argon 使用 [GPL V3.0](https://github.com/solstice23/argon-theme/blob/master/LI
 
 # 更新日志
 
+## 20200401 v0.923
++ ~~本次更新没有新增任何东西，只更新了版本号~~
++ 修复设置顶栏图标后手机端排版的问题
+
 ## 20200331 v0.922
 + 修复评论编辑历史记录时间显示错误的问题
 

diff --git a/header.php b/header.php
@@ -214,7 +214,7 @@ function toggleAmoledDarkMode(){
 		<nav id="navbar-main" class="navbar navbar-main navbar-expand-lg navbar-transparent navbar-light bg-primary headroom--not-bottom headroom--not-top headroom--pinned">
 			<div class="container">
 				<?php if (get_option('argon_toolbar_icon') != '') { /*顶栏ICON(如果选项中开启)*/?>
-					<a class="navbar-brand mr-lg-5" href="<?php echo get_option('argon_toolbar_icon_link'); ?>">
+					<a class="navbar-brand navbar-icon mr-lg-5" href="<?php echo get_option('argon_toolbar_icon_link'); ?>">
 						<img src="<?php echo get_option('argon_toolbar_icon'); ?>">
 					</a>
 				<?php }?>
@@ -226,13 +226,7 @@ function toggleAmoledDarkMode(){
 				<div class="navbar-collapse collapse" id="navbar_global">
 					<div class="navbar-collapse-header">
 						<div class="row">
-							<div class="col-6 collapse-brand">
-								<?php if (get_option('argon_toolbar_icon') != '') { /*顶栏ICON(小屏折叠菜单中)(如果选项中开启)*/?>
-									<a class="navbar-brand mr-lg-5" href="<?php echo get_option('argon_toolbar_icon_link'); ?>">
-										<img src="<?php echo get_option('argon_toolbar_icon'); ?>">
-									</a>
-								<?php }?>
-							</div>
+							<div class="col-6 collapse-brand"></div>
 							<div class="col-6 collapse-close">
 								<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar_global" aria-controls="navbar_global" aria-expanded="false" aria-label="Toggle navigation">
 									<span></span>
@@ -313,6 +307,11 @@ public function end_el( &$output, $object, $depth = 0, $args = array(), $current
 						</li>
 					</ul>
 				</div>
+				<?php if (get_option('argon_toolbar_icon') != '') { /*顶栏ICON (Mobile)*/?>
+					<a class="navbar-brand navbar-icon-mobile" href="<?php echo get_option('argon_toolbar_icon_link'); ?>">
+						<img src="<?php echo get_option('argon_toolbar_icon'); ?>">
+					</a>
+				<?php }?>
 				<div id="navbar_menu_mask" data-toggle="collapse" data-target="#navbar_global"></div>
 			</div>
 		</nav>

diff --git a/info.json b/info.json
@@ -1,5 +1,5 @@
 {
-  "version" : "0.922",
+  "version" : "0.923",
   "details_url" : "https://github.com/solstice23/argon-theme/releases",
-  "download_url" : "https://github.com/solstice23/argon-theme/releases/download/v0.922/argon.zip"
+  "download_url" : "https://github.com/solstice23/argon-theme/releases/download/v0.923/argon.zip"
 }
diff --git a/style.css b/style.css
@@ -3,7 +3,7 @@ Theme Name: argon
 Author: solstice23
 Author URI: https://solstice23.top/
 Description: 轻盈、简洁、美观的 Wordpress 主题
-Version: 0.922
+Version: 0.923
 License: GNU General Public License v3.0
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Tags: 简约, 两栏, 侧栏在左边, 浮动侧栏, 文章目录, 自适应, 夜间模式, 可自定义
@@ -339,6 +339,9 @@ html.darkmode.amoled-dark #navbar-main{
 .navbar-brand:focus , .navbar-brand:hover{
 	color: #fff !important;
 }
+.navbar-brand.navbar-icon-mobile {
+    display: none;
+}
 #navbar-main{
 	transition: background 0s, padding .15s ease;
 	background-color: var(--toolbar-color) !important;
@@ -3296,6 +3299,14 @@ html.darkmode.amoled-dark #content:before , html.darkmode.amoled-dark #content:a
 		border-bottom: 1px solid rgba(255,255,255,.1);
 	}
 
+	.navbar-brand.navbar-icon {
+		display: none;
+	}
+	.navbar-brand.navbar-icon-mobile {
+		display: block;
+		margin-right: 5px;
+	}
+
 	#navbar_search_btn_mobile{
 		display: list-item;
 	}