Skip to content

两处小优化 #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

两处小优化 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
664e1d0
1、“顶栏标题”增加 h1 标签，以便实现 SEO；
jackytsu Dec 4, 2020
d3e0725
1、中英文之间加空格；
jackytsu Dec 14, 2020
36c8633
修复顶部导航增加 h1 标签后导致的高度变化；
jackytsu Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ function argon_get_comment_text($comment_ID = 0, $args = array()) {
if (get_option("argon_comment_emotion_keyboard", "true") != "false"){
global $emotionListDefault;
$emotionList = apply_filters("argon_emotion_list", $emotionListDefault);
foreach ($emotionList as $groupIndex => $group){
foreach ($emotionList as $groupIndex => $group){
foreach ($group['list'] as $index => $emotion){
if ($emotion['type'] != 'sticker'){
continue;
Expand Down Expand Up @@ -2724,6 +2724,13 @@ function themeoptions_page(){
<p class="description"><?php _e('需带上 http(s) ，留空则显示默认背景', 'argon');?></br><?php _e('输入', 'argon');?> <code>--bing--</code> <?php _e('调用必应每日一图', 'argon');?></p>
</td>
</tr>
<tr>
<th><label><?php _e('Banner Logo 图 (地址)', 'argon');?></label></th>
<td>
<input type="text" class="regular-text" name="argon_banner_logo_url" value="<?php echo get_option('argon_banner_logo_url'); ?>"/>
<p class="description"><?php _e('需带上 http(s) ，留空则不显示', 'argon');?></p>
</td>
</tr>
<tr>
<th><label><?php _e('Banner 渐变背景样式', 'argon');?></label></th>
<td>
Expand Down Expand Up @@ -4115,6 +4122,7 @@ function argon_update_themeoptions(){
argon_update_option('argon_banner_title');
argon_update_option('argon_banner_subtitle');
argon_update_option('argon_banner_background_url');
argon_update_option('argon_banner_logo_url');
argon_update_option('argon_banner_background_color_type');
argon_update_option('argon_banner_background_hide_shapes');
argon_update_option('argon_enable_smoothscroll_type');
Expand Down
14 changes: 10 additions & 4 deletions header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ function toggleAmoledDarkMode(){
</a>
<?php }?>
<?php /*顶栏标题*/?>
<a class="navbar-brand navbar-title" href="<?php bloginfo('url'); ?>"><?php echo get_option('argon_toolbar_title') == '' ? bloginfo('name') : get_option('argon_toolbar_title'); ?></a>
<h1><a class="navbar-brand navbar-title" href="<?php bloginfo('url'); ?>"><?php echo get_option('argon_toolbar_title') == '' ? bloginfo('name') : get_option('argon_toolbar_title'); ?></a></h1>
</div>
<div class="navbar-collapse collapse" id="navbar_global">
<div class="navbar-collapse-header">
Expand Down Expand Up @@ -392,12 +392,18 @@ public function end_el( &$output, $object, $depth = 0, $args = array(), $current
<?php
$banner_title = get_option('argon_banner_title') == '' ? get_bloginfo('name') : get_option('argon_banner_title');
$enable_banner_title_typing_effect = get_option('argon_enable_banner_title_typing_effect') != 'true' ? "false" : get_option('argon_enable_banner_title_typing_effect');
?>

if (get_option('argon_banner_logo_url') != '') {
$banner_logo = "<img src=\"" . esc_attr(get_option('argon_banner_logo_url')) . "\" alt=\"logo\">";
} else {
$banner_logo = "";
}
?>
<div id="banner_container" class="banner-container container text-center">
<?php if ($enable_banner_title_typing_effect != "true"){?>
<div class="banner-title text-white"><span class="banner-title-inner"><?php echo $banner_title; ?></span>
<div class="banner-title text-white"><?php echo $banner_logo; ?><span class="banner-title-inner"><?php echo $banner_title; ?></span>
<?php } else {?>
<div class="banner-title text-white" data-text="<?php echo $banner_title; ?>" data-interval="<?php echo (get_option('argon_banner_typing_effect_interval') == '' ? '100' : get_option('argon_banner_typing_effect_interval')); ?>"><span class="banner-title-inner">&nbsp;</span>
<div class="banner-title text-white" data-text="<?php echo $banner_title; ?>" data-interval="<?php echo (get_option('argon_banner_typing_effect_interval') == '' ? '100' : get_option('argon_banner_typing_effect_interval')); ?>"><?php echo $banner_logo; ?><span class="banner-title-inner">&nbsp;</span>
<?php }?>
<?php echo get_option('argon_banner_subtitle') == '' ? '' : '<span class="banner-subtitle d-block">' . get_option('argon_banner_subtitle') . '</span>'; ?></div>
</div>
Expand Down
34 changes: 23 additions & 11 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ article h1 , article h2 , article h3 , article h4 , article h5 , article h6 , ar
article h1 , article h2 , article h3 , article h4 , article h5 , article h6{
margin-top: 18px !important;
margin-bottom: 15px;
}
}
article h1{
font-size: 30px;
}
Expand Down Expand Up @@ -474,6 +474,13 @@ html.darkmode.amoled-dark #navbar-main{
text-transform: none;
vertical-align: middle;
}
.navbar-brand h1 {
margin: 0;
padding: 0;
line-height: 21px;
height: 22px;
font-size: 14px;
}
.navbar-brand:focus , .navbar-brand:hover{
color: #fff !important;
}
Expand Down Expand Up @@ -550,6 +557,11 @@ body.leftbar-can-headroom.headroom---unpinned #navbar-main{
width: 100%;
left: 0;
}
.banner-title img{
max-height: 125px;
display: block;
margin: auto auto 15px;
}
.banner-subtitle{
margin-top: 10px;
font-size: 16px;
Expand Down Expand Up @@ -1774,7 +1786,7 @@ html.darkmode.amoled-dark .tippy-box[data-theme~=light]{color:#eee;background-co
}
.comment-item-avatar{
display: block;
width: 40px;
width: 40px;
margin-top: 26px;
margin-right: 15px;
}
Expand Down Expand Up @@ -2212,9 +2224,9 @@ html.darkmode .comment-edit-history-item {
width: max-content;
width: -moz-max-content;
}
.post-comment-link-container:hover:before , .post-comment-link-container.active:before ,
.post-comment-captcha-container:hover:before , .post-comment-captcha-container.active:before ,
#post_comment_toggle_extra_input:hover:before ,
.post-comment-link-container:hover:before , .post-comment-link-container.active:before ,
.post-comment-captcha-container:hover:before , .post-comment-captcha-container.active:before ,
#post_comment_toggle_extra_input:hover:before ,
.comment-post-checkbox:hover:before{
transform: translateY(0);
opacity: .7;
Expand All @@ -2239,7 +2251,7 @@ html.darkmode .comment-edit-history-item {
.show-extra-input #post_comment_toggle_extra_input i{
transform: rotateZ(180deg);
}
#post_comment.logged #post_comment_name ,
#post_comment.logged #post_comment_name ,
#post_comment.logged #post_comment_email{
opacity: 1;
background-color: #e9ecef;
Expand Down Expand Up @@ -3816,16 +3828,16 @@ html.darkmode .leftbar-menu-subitem {
html.darkmode .leftbar-menu-item > a{
color: #eee !important;
}
html.darkmode .leftbar-menu-item > a:hover ,
html.darkmode .leftbar-menu-item > a:hover ,
html.darkmode .leftbar-menu-item.current > a {
background-color: #606060;
}

html.darkmode .site-author-links-item:hover {
background: #555;
}
html.darkmode .site-state-item-count ,
html.darkmode .site-author-links-item > a ,
html.darkmode .site-state-item-count ,
html.darkmode .site-author-links-item > a ,
html.darkmode .site-friend-links-item > a{
color: #eee !important;
}
Expand Down Expand Up @@ -4010,7 +4022,7 @@ html.darkmode.amoled-dark body{
html.darkmode.amoled-dark .leftbar-menu-subitem {
background: #000;
}
html.darkmode.amoled-dark .leftbar-menu-item > a:hover ,
html.darkmode.amoled-dark .leftbar-menu-item > a:hover ,
html.darkmode.amoled-dark .leftbar-menu-item.current > a {
background-color: #222;
}
Expand Down Expand Up @@ -4498,4 +4510,4 @@ html.using-safari #blog_setting_toggle_darkmode_and_amoledarkmode:before ,
html.using-safari #blog_setting_card_radius_to_default:before{
transform: translate3d(-50%, 0, 0) !important;
white-space: nowrap;
}
}