mirror of
https://github.com/typecho/typecho.git
synced 2025-03-22 10:59:41 +01:00
Merge branch 'master' of https://github.com/typecho/typecho-replica
This commit is contained in:
joyqi
commit
2b13327c2a
@ -678,6 +678,23 @@ margin-top: 25px;
|
||||
background: #292D33;
|
||||
}
|
||||
|
||||
.typecho-head-nav a {
|
||||
color: #BBB;
|
||||
}
|
||||
.typecho-head-nav a:hover {
|
||||
color: #FFF;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.typecho-head-nav .site-name {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
padding: 0 20px 0 10px;
|
||||
height: 36px;
|
||||
line-height: 36px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#typecho-nav-list ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
@ -693,10 +710,6 @@ margin-top: 25px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
#typecho-nav-list .parent {
|
||||
float: left;
|
||||
}
|
||||
|
||||
#typecho-nav-list .parent a {
|
||||
display: block;
|
||||
float: left;
|
||||
@ -711,12 +724,12 @@ margin-top: 25px;
|
||||
#typecho-nav-list .focus .parent a,
|
||||
#typecho-nav-list .root:hover .parent a {
|
||||
background: #202328;
|
||||
color: #FFF;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#typecho-nav-list .focus .parent a {
|
||||
font-weight: bold;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
#typecho-nav-list .child {
|
||||
@ -745,7 +758,6 @@ margin-top: 25px;
|
||||
}
|
||||
|
||||
#typecho-nav-list .child li a {
|
||||
text-decoration: none;
|
||||
color: #BBB;
|
||||
display: block;
|
||||
padding: 0 20px;
|
||||
@ -766,12 +778,20 @@ margin-top: 25px;
|
||||
}
|
||||
|
||||
.typecho-head-nav .operate {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
right: 0;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.typecho-head-nav .operate .author {
|
||||
.typecho-head-nav .operate a {
|
||||
display: inline-block;
|
||||
margin-left: -1px;
|
||||
padding: 0 20px;
|
||||
border: 1px solid #383D45;
|
||||
border-width: 0 1px;
|
||||
line-height: 36px;
|
||||
color: #BBB;
|
||||
}
|
||||
.typecho-head-nav .operate a:hover {
|
||||
background-color: #202328;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
|
||||
@ -824,7 +844,7 @@ margin-top: 25px;
|
||||
}
|
||||
.typecho-page-title h2 a {
|
||||
margin-left: 10px;
|
||||
padding: 3px 6px;
|
||||
padding: 3px 8px;
|
||||
background: #E9E9E6;
|
||||
font-size: .8em;
|
||||
|
||||
@ -933,15 +953,18 @@ margin-top: 25px;
|
||||
*/
|
||||
.typecho-option-tabs {
|
||||
list-style: none;
|
||||
margin: 0 0 20px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.typecho-option-tabs a {
|
||||
display: block;
|
||||
margin-right: -1px;
|
||||
border: 1px solid #D9D9D6;
|
||||
padding: 0 15px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
color: #666;
|
||||
}
|
||||
.typecho-option-tabs a:hover {
|
||||
background-color: #E9E9E6;
|
||||
@ -958,8 +981,7 @@ margin-top: 25px;
|
||||
}
|
||||
|
||||
.typecho-option-tabs li.current a {
|
||||
background-color: #467B96;
|
||||
color: #FFF;
|
||||
background-color: #E9E9E6;
|
||||
}
|
||||
|
||||
.typecho-option-tabs li:hover, .typecho-option-tabs li.current {
|
||||
@ -979,7 +1001,7 @@ margin-top: 25px;
|
||||
}
|
||||
|
||||
.typecho-list-operate {
|
||||
margin-bottom: 20px;
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
.typecho-list-operate input,
|
||||
@ -1031,8 +1053,8 @@ a.operate-reply {
|
||||
*/
|
||||
/** 增加表格标题 by 70 */
|
||||
.typecho-list-table-title {
|
||||
margin: 1em 0;
|
||||
color: #999;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.typecho-list-table {
|
||||
@ -1135,10 +1157,13 @@ a.operate-reply {
|
||||
/**
|
||||
* 评论管理
|
||||
*/
|
||||
|
||||
.comment-content {
|
||||
margin: -0.5em 0;
|
||||
}
|
||||
.comment-meta span,
|
||||
.comment-date {
|
||||
font-size: .92857em;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
@ -1575,8 +1600,10 @@ ul.typecho-list-notable li .loading {
|
||||
}
|
||||
|
||||
.typecho-post-area #auto-save-message {
|
||||
display: block;
|
||||
margin-top: 0.5em;
|
||||
color: #999;
|
||||
line-height: 32px;
|
||||
font-size: .92857em;
|
||||
}
|
||||
|
||||
/*.typecho-post-area .typecho-preview-label {
|
||||
@ -1647,7 +1674,8 @@ ul.typecho-list-notable li .loading {
|
||||
.typecho-post-area label.typecho-label cite {
|
||||
}
|
||||
|
||||
.typecho-post-area .submit {
|
||||
.typecho-post-area .submit .right button {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.typecho-post-area .right {
|
||||
@ -2020,10 +2048,10 @@ ul.typecho-list-notable li .loading {
|
||||
background-color: #FFFBCC;
|
||||
}
|
||||
.tDnD_whileDrag {
|
||||
-ms-transform-origin: 0 0;
|
||||
-moz-transform-origin: 0 0;
|
||||
-webkit-transform-origin: 0 0;
|
||||
transform-origin: 0 0;
|
||||
-ms-transform-origin: 20% 0;
|
||||
-moz-transform-origin: 20% 0;
|
||||
-webkit-transform-origin: 20% 0;
|
||||
transform-origin: 20% 0;
|
||||
|
||||
-ms-transform: rotate(2deg);
|
||||
-moz-transform: rotate(2deg);
|
||||
|
||||
@ -121,6 +121,10 @@ $comments = Typecho_Widget::widget('Widget_Comments_Admin');
|
||||
<div class="comment-content">
|
||||
<?php $comments->content(); ?>
|
||||
</div>
|
||||
<form action="post" class="comment-reply">
|
||||
<p><textarea name="" id="" class="w-90" rows="3"></textarea></p>
|
||||
<p><button type="submit" class="btn-s">提交回复</button></p>
|
||||
</form>
|
||||
<div class="comment-action hidden-by-mouse">
|
||||
<?php if('approved' == $comments->status): ?>
|
||||
<span class="weak"><?php _e('通过'); ?></span>
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
|
||||
<div class="typecho-head-nav clearfix">
|
||||
<div id="typecho-nav-list">
|
||||
<a class="site-name" href="<?php $options->siteUrl(); ?>"><?php $options->title(); ?></a>
|
||||
<nav id="typecho-nav-list">
|
||||
<?php $menu->output(); ?>
|
||||
</div>
|
||||
<a href="">Typecho</a>
|
||||
<a href="<?php $options->siteUrl(); ?>"><?php _e('我的站点'); ?></a>
|
||||
</nav>
|
||||
<div class="operate">
|
||||
<?php Typecho_Plugin::factory('admin/menu.php')->navBar(); _e('欢迎'); ?>,
|
||||
<a href="<?php $options->adminUrl('profile.php'); ?>" class="author important"><?php $user->screenName(); ?></a>
|
||||
<a class="exit" href="<?php $options->logoutUrl(); ?>"><?php _e('登出'); ?></a>
|
||||
<!-- <?php Typecho_Plugin::factory('admin/menu.php')->navBar(); _e('欢迎'); ?>, -->
|
||||
<a href="<?php $options->adminUrl('profile.php'); ?>" class="author"><?php $user->screenName(); ?></a><!--
|
||||
--><a class="exit" href="<?php $options->logoutUrl(); ?>"><?php _e('登出'); ?></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
|
||||
<div class="message <?php $notice->noticeType(); ?> popup">
|
||||
<ul>
|
||||
|
||||
@ -10,7 +10,7 @@ include 'menu.php';
|
||||
<div class="col-mb-12 typecho-list">
|
||||
<?php Typecho_Widget::widget('Widget_Plugins_List_Activated')->to($activatedPlugins); ?>
|
||||
<?php if ($activatedPlugins->have()): ?>
|
||||
<!--<h4 class="typecho-list-table-title"><?php _e('启用的插件'); ?></h4>-->
|
||||
<h4 class="typecho-list-table-title"><?php _e('启用的插件'); ?></h4>
|
||||
<table class="typecho-list-table">
|
||||
<colgroup>
|
||||
<col width="25%"/>
|
||||
|
||||
@ -44,16 +44,13 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
|
||||
</p>
|
||||
<p>
|
||||
<textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($post->text); ?></textarea>
|
||||
<span id="auto-save-message"></span>
|
||||
</p>
|
||||
|
||||
<?php include 'file-upload.php'; ?>
|
||||
|
||||
<?php Typecho_Plugin::factory('admin/write-post.php')->content($post); ?>
|
||||
<p class="submit">
|
||||
<span class="left">
|
||||
<span id="auto-save-message"></span>
|
||||
</span>
|
||||
|
||||
<span class="right">
|
||||
<input type="hidden" name="cid" value="<?php $post->cid(); ?>" />
|
||||
<button type="submit" name="do" value="save" id="btn-save"><?php _e('保存草稿'); ?></button>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user