mirror of
https://github.com/typecho/typecho.git
synced 2025-03-20 01:49:40 +01:00
Merge branch 'master' of https://github.com/typecho/typecho-replica
This commit is contained in:
joyqi
commit
8018b2db6b
@ -676,7 +676,7 @@ margin-top: 25px;
|
||||
*/
|
||||
.typecho-head-nav {
|
||||
padding: 0 10px;
|
||||
background: #2E3639;
|
||||
background: #292D33;
|
||||
}
|
||||
|
||||
.typecho-nav-list {
|
||||
@ -709,7 +709,7 @@ margin-top: 25px;
|
||||
#typecho-nav-list .parent a:hover,
|
||||
#typecho-nav-list .focus .parent a,
|
||||
#typecho-nav-list .root:hover .parent a {
|
||||
background: #434A4D;
|
||||
background: #202328;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
@ -718,7 +718,7 @@ margin-top: 25px;
|
||||
position: absolute;
|
||||
top: 36px;
|
||||
margin: 0;
|
||||
background: #2E3639;
|
||||
background: #202328;
|
||||
overflow: hidden;
|
||||
z-index: 250;
|
||||
width: 160px;
|
||||
@ -740,7 +740,10 @@ margin-top: 25px;
|
||||
#typecho-nav-list .child li a:hover,
|
||||
#typecho-nav-list .child li.focus a,
|
||||
#typecho-nav-list .child li.focus a:hover {
|
||||
background: #434A4D;
|
||||
background: #292D33;
|
||||
}
|
||||
#typecho-nav-list .child li.focus a {
|
||||
color: #6DA1BB;
|
||||
}
|
||||
|
||||
#typecho-nav-list .child li a {
|
||||
@ -912,30 +915,27 @@ margin-top: 25px;
|
||||
.typecho-option-tabs {
|
||||
list-style: none;
|
||||
margin: 0 0 20px;
|
||||
padding: 10px;
|
||||
background: #FFF;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.typecho-option-tabs a {
|
||||
display: block;
|
||||
padding: 0 15px;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
border-radius: 24px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
.typecho-option-tabs a:hover {
|
||||
background-color: #ECF3F7;
|
||||
background-color: #E9E9E6;
|
||||
color: #666;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.typecho-option-tabs li {
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.typecho-option-tabs li.right {
|
||||
float: right;
|
||||
margin: 0 0 0 10px;
|
||||
}
|
||||
|
||||
.typecho-option-tabs li.current a {
|
||||
@ -1559,9 +1559,6 @@ ul.typecho-list-notable li .loading {
|
||||
}
|
||||
|
||||
.typecho-post-area #auto-save-message {
|
||||
margin-top: 5px;
|
||||
color: #999;
|
||||
font-size: .92857em;
|
||||
}
|
||||
|
||||
/*.typecho-post-area .typecho-preview-label {
|
||||
@ -1860,10 +1857,8 @@ ul.typecho-list-notable li .loading {
|
||||
}
|
||||
|
||||
.typecho-attachment-photo-box img {
|
||||
border: 1px solid #E8EDD6;
|
||||
background: #fff;
|
||||
padding: 3px;
|
||||
max-width: 610px;
|
||||
border: 1px solid #E6E6E3;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.typecho-mime {
|
||||
@ -2006,8 +2001,7 @@ ul.typecho-list-notable li .loading {
|
||||
}
|
||||
|
||||
#upload-panel.drag {
|
||||
border-color: #ccc;
|
||||
background-color: #e3e3e3;
|
||||
background-color: #FFF9E8;
|
||||
}
|
||||
|
||||
#file-list {
|
||||
@ -2070,7 +2064,23 @@ ul.typecho-list-notable li .loading {
|
||||
margin-top: 20px;
|
||||
border-top: 1px solid #EEE;
|
||||
}
|
||||
#ui-datepicker-div select { height: 20px; }
|
||||
#ui-datepicker-div .ui-slider {
|
||||
position: relative;
|
||||
margin-top: 18px;
|
||||
border: 1px solid #E9E9E6;
|
||||
background-color: #F6F6F3;
|
||||
height: 4px;
|
||||
}
|
||||
#ui-datepicker-div .ui-slider .ui-slider-handle {
|
||||
position: absolute;
|
||||
top: -7px;
|
||||
margin-left: -5px;
|
||||
z-index: 2;
|
||||
width: 10px;
|
||||
height: 16px;
|
||||
background-color: #467B96;
|
||||
}
|
||||
|
||||
#ui-datepicker-div .ui-datepicker-buttonpane {
|
||||
padding-top: 10px;
|
||||
border-top: 1px solid #EEE;
|
||||
|
||||
@ -13,7 +13,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
|
||||
<div class="col-mb-12 col-tb-8">
|
||||
<div class="typecho-attachment-photo-box">
|
||||
<?php if ($attachment->attachment->isImage): ?>
|
||||
<img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" />
|
||||
<p><img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" /></p>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="description">
|
||||
|
||||
@ -10,7 +10,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
|
||||
<div class="body container">
|
||||
<?php include 'page-title.php'; ?>
|
||||
<div class="col-group typecho-page-main">
|
||||
<div class="col-mb-12 col-tb-9 typecho-content-panel">
|
||||
<div class="col-mb-12 col-tb-8 typecho-content-panel">
|
||||
<fieldset>
|
||||
<legend><?php _e('个人资料'); ?></legend>
|
||||
<?php Typecho_Widget::widget('Widget_Users_Profile')->profileForm()->render(); ?>
|
||||
@ -30,7 +30,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
<div class="col-tb-3">
|
||||
<div class="col-tb-3 col-tb-offset-1">
|
||||
<?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=128&r=X' .
|
||||
'&d=" alt="' . $user->screenName . '" />'; ?>
|
||||
<h2><?php $user->screenName(); ?><br><small><?php $user->name(); ?></small></h2>
|
||||
|
||||
@ -9,7 +9,7 @@ include 'menu.php';
|
||||
<div class="body container">
|
||||
<?php include 'page-title.php'; ?>
|
||||
<div class="col-group typecho-page-main">
|
||||
<div class="col-mb-12">
|
||||
<div class="col-mb-12 col-tb-8 col-tb-offset-2">
|
||||
<?php Typecho_Widget::widget('Widget_Users_Edit')->form()->render(); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -42,9 +42,12 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
|
||||
<p><input id="tags" name="tags" type="text" value="<?php $post->tags(',', false); ?>" class="w-100 text" /></p>
|
||||
<?php Typecho_Plugin::factory('admin/write-post.php')->content($post); ?>
|
||||
<p class="submit">
|
||||
<a href="###" id="advance-panel-btn" class="left"><?php _e('高级选项'); ?></a>
|
||||
<span class="right">
|
||||
<span class="left">
|
||||
<a href="###" id="advance-panel-btn"><?php _e('高级选项'); ?></a>
|
||||
<span id="auto-save-message">保存于 1 分钟前</span>
|
||||
</span>
|
||||
|
||||
<span class="right">
|
||||
<input type="hidden" name="cid" value="<?php $post->cid(); ?>" />
|
||||
<input type="hidden" name="do" value="publish" />
|
||||
<button type="button" id="btn-preview"><?php _e('预览'); ?></button>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user