ouyang/typecho
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整布局

Browse Source
This commit is contained in:
fen
2013-10-11 14:09:52 +08:00
parent 38a2798dc9
commit 75131c9f3e
11 changed files with 324 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/copyright.php
+7 -10
View File
@@ -1,13 +1,10 @@
<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
<div class="typecho-foot">
<h4><a href="http://typecho.org" class="logo-dark">typecho</a></h4>
<div class="copyright"><?php _e('基于 <em>%s %s</em> <small> | %s</small> 构建', $options->software, $prefixVersion, $suffixVersion); ?></div>
<div class="resource">
<ul>
<li><a href="http://docs.typecho.org"><?php _e('文档'); ?></a></li>
<li><a href="http://forum.typecho.org"><?php _e('支持论坛'); ?></a></li>
<li><a href="http://code.google.com/p/typecho/issues/entry"><?php _e('报告错误'); ?></a></li>
<li><a href="http://extends.typecho.org"><?php _e('其他资源'); ?></a></li>
</ul>
</div>
<div class="copyright"><?php _e('基于 <a href="http://typecho.org">%s</a> %s %s 构建', $options->software, $prefixVersion, $suffixVersion); ?></div>
<nav class="resource">
<a href="http://docs.typecho.org"><?php _e('文档'); ?></a>
<a href="http://forum.typecho.org"><?php _e('支持论坛'); ?></a>
<a href="http://code.google.com/p/typecho/issues/entry"><?php _e('报告错误'); ?></a>
<a href="http://extends.typecho.org"><?php _e('其他资源'); ?></a>
</nav>
</div>
admin/css/grid.css
+159
View File
@@ -378,6 +378,165 @@
.col-push-11 {
left: 91.66667%; }
.col-push-12 {
left: 100%; } }
/*
* Widescreen and up
*/
@media (min-width: 1200px) {
.container {
max-width: 1160px; }
.col-wd-1 {
width: 8.33333%; }
.col-wd-2 {
width: 16.66667%; }
.col-wd-3 {
width: 25%; }
.col-wd-4 {
width: 33.33333%; }
.col-wd-5 {
width: 41.66667%; }
.col-wd-6 {
width: 50%; }
.col-wd-7 {
width: 58.33333%; }
.col-wd-8 {
width: 66.66667%; }
.col-wd-9 {
width: 75%; }
.col-wd-10 {
width: 83.33333%; }
.col-wd-11 {
width: 91.66667%; }
.col-wd-12 {
width: 100%; }
.col-offset-0 {
margin-left: 0%; }
.col-offset-1 {
margin-left: 8.33333%; }
.col-offset-2 {
margin-left: 16.66667%; }
.col-offset-3 {
margin-left: 25%; }
.col-offset-4 {
margin-left: 33.33333%; }
.col-offset-5 {
margin-left: 41.66667%; }
.col-offset-6 {
margin-left: 50%; }
.col-offset-7 {
margin-left: 58.33333%; }
.col-offset-8 {
margin-left: 66.66667%; }
.col-offset-9 {
margin-left: 75%; }
.col-offset-10 {
margin-left: 83.33333%; }
.col-offset-11 {
margin-left: 91.66667%; }
.col-offset-12 {
margin-left: 100%; }
.col-pull-0 {
right: 0%; }
.col-pull-1 {
right: 8.33333%; }
.col-pull-2 {
right: 16.66667%; }
.col-pull-3 {
right: 25%; }
.col-pull-4 {
right: 33.33333%; }
.col-pull-5 {
right: 41.66667%; }
.col-pull-6 {
right: 50%; }
.col-pull-7 {
right: 58.33333%; }
.col-pull-8 {
right: 66.66667%; }
.col-pull-9 {
right: 75%; }
.col-pull-10 {
right: 83.33333%; }
.col-pull-11 {
right: 91.66667%; }
.col-pull-12 {
right: 100%; }
.col-push-0 {
left: 0%; }
.col-push-1 {
left: 8.33333%; }
.col-push-2 {
left: 16.66667%; }
.col-push-3 {
left: 25%; }
.col-push-4 {
left: 33.33333%; }
.col-push-5 {
left: 41.66667%; }
.col-push-6 {
left: 50%; }
.col-push-7 {
left: 58.33333%; }
.col-push-8 {
left: 66.66667%; }
.col-push-9 {
left: 75%; }
.col-push-10 {
left: 83.33333%; }
.col-push-11 {
left: 91.66667%; }
.col-push-12 {
left: 100%; } }
.clearfix, .col-group {
admin/css/style.css
+81 -441
View File
@@ -21,57 +21,7 @@ body {
background: #F9F9F7;
color: #444;
font-size: 87.5%;
}
/*
body > div {
background: #f7fbe9;
color: #333;
}
*/
body.bright, .main {
}
.main:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
body.no-overflow {
overflow: hidden;
}
body.dark {
background: #333;
}
h1, h2, h3, h4, h5, h6, p {
color: #333;
}
h1, h2, h3, h4, h5, h6 {
font-weight: 600;
/*font-family: Georgia, serif;*/
}
h1 {
font-size: 18px;
}
h2 {
font-size: 16px;
}
ul, ol {
list-style: none;
}
p {
font-size: 13px;
line-height: 1.5;
}
a {
@@ -107,6 +57,10 @@ span.balloon {
color: #666;
}
code, pre, .mono {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
a.size-1 {
background: #C4CD9C;
}
@@ -168,64 +122,40 @@ a.important {
color: #fff;
}
em {
color: #e47e00;
font-weight: normal;
}
form {
padding: 0;
margin: 0;
}
input, textarea {
font-size: 13px;
padding: 2px;
}
@media screen and (-webkit-min-device-pixel-ratio:0) {
input, textarea { padding: 1px; margin: 0; }
button { padding: 0 6px; }
select { padding: 0; }
}
/*
* Forms
*/
input[type=text], input[type=password], input[type=email],
textarea {
overflow: auto;
line-height: 150%;
resize: none;
}
em {
font-style: normal;
}
input:hover {
/*
cursor: pointer;
*/
}
input, select, textarea {
font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
vertical-align: middle;
}
input[type=text], input[type=password],
input.text, input.title,
textarea {
padding: 3px;
background: #FFF;
border: 1px solid #C6C6C6;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.5);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.5);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.5);
font-family: Menlo,Monaco,Consolas,"Lucida Console","Courier New",monospace;
border: 1px solid #CCC;
padding: 7px;
border-radius: 2px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
input[type=checkbox] {
margin: 3px;
textarea {
resize: vertical;
}
input.text-s { padding: 5px; }
.w-10 { width: 10%; }
.w-20 { width: 20%; }
.w-30 { width: 30%; }
.w-40 { width: 40%;}
.w-50 { width: 50%;}
.w-60 { width: 60%;}
.w-70 { width: 70%;}
.w-80 { width: 80%;}
.w-90 { width: 90%;}
.w-100 { width: 100%;}
/** hack webkit border by 70 */
select {
font-size: 13px;
@@ -367,53 +297,6 @@ button.primary:active, button.primary.active {
}
img.avatar {
padding: 2px;
background: #FFF;
float: right;
border-bottom: 1px solid #DEE4C5;
border-right: 1px solid #DEE4C5;
}
/**
* clearfix
*/
.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
* html>body .clearfix { display: inline-block; width: 100%; }
* html .clearfix { height: 1%; /* End hide from IE-mac */ }
/* ie7 hack*/
*+html .clearfix { min-height: 1%; }
/*]]>*/
/**
* 圆角
*/
.typecho-radius-topleft {
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
}
.typecho-radius-topright {
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
}
.typecho-radius-bottomleft {
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.typecho-radius-bottomright {
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
}
/**
* logo 的样式
*/
@@ -426,15 +309,6 @@ img.avatar {
background: url(../images/sprite.png) no-repeat scroll 0px -78px;
}
.logo-dark {
display: block;
height: 21px;
width: 92px;
overflow: hidden;
text-indent: -9999px;
background: url(../images/sprite.png) no-repeat scroll 0px -150px;
}
.loading {
background-image: url(../images/ajax-loader.gif);
background-position: left center;
@@ -445,26 +319,32 @@ img.avatar {
/**
* 典型配置选项
*/
/*
.typecho-option {
list-style: none;
padding: 0;
}
*/
.typecho-option li {
padding-left: 110px;
}
.typecho-option-submit li {
border-bottom: none;
}
.typecho-option label.typecho-label {
float: left;
width: 110px;
position: absolute;
left: -200px;
width: 180px;
text-align: right;
margin: 1px 5px 0 -120px;
font-size: 13px;
}
.typecho-option label.typecho-label+input {
margin-top: -7px;
}
.typecho-option .description {
color: #555;
margin: .5em 0 0;
color: #999;
font-size: .92857em;
}
/** 增加配置面板内部的错误样式 by 70 */
@@ -673,11 +553,9 @@ img.avatar {
.typecho-install .typecho-option .message,
.typecho-install .typecho-option input {
width: 325px;
}
.typecho-install .typecho-option input.mini {
width: 125px;
}
/*
@@ -760,10 +638,6 @@ margin-top: 25px;
margin: 15% auto;
}
.typecho-login .logo, .typecho-login .logo-dark {
margin: 0px auto 15px;
}
.typecho-login form {
background: #e5ead1;
margin: 0 10px;
@@ -776,13 +650,9 @@ margin-top: 25px;
}
.typecho-login label {
display: block;
font-weight: bold;
}
.typecho-login input.text {
width: 205px;
font-size: 18px;
}
.typecho-login form p {
@@ -826,7 +696,7 @@ margin-top: 25px;
*/
.typecho-head-nav {
height: 40px;
background: #363636;
background: #2E3639;
}
.typecho-nav-list {
@@ -849,39 +719,29 @@ margin-top: 25px;
}
#typecho-nav-list .parent a {
color: #CCC;
color: #FFF;
height: 40px;
line-height: 40px;
display: block;
outline: none;
padding: 0 30px;
padding: 0 20px;
float: left;
font-size: 14px;
}
#typecho-nav-list .parent a:hover, #typecho-nav-list .focus .parent a, #typecho-nav-list .root:hover .parent a {
background: #444;
background: #62686B;
text-decoration: none;
}
#typecho-nav-list .child {
display: none;
position:absolute;
border: 1px solid #CED7A8;
border-top: none;
background: #DCE2C0;
overflow: hidden;
padding: 10px;
z-index: 250;
position: absolute;
top: 40px;
margin: 0;
border-top: none;
background: #2E3639;
overflow: hidden;
z-index: 250;
width: 160px;
-moz-border-radius-bottomleft: 3px;
-moz-border-radius-bottomright: 3px;
-webkit-border-bottom-left-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
/* hope IE support border radius, God save me! */
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
#typecho-nav-list .root:hover .child {
@@ -889,52 +749,40 @@ margin-top: 25px;
}
#typecho-nav-list .child li {
/*margin-bottom: 1px;*/
border-top: 1px solid #EFEFDE;
border-bottom: 1px solid #CED6A5;
}
#typecho-nav-list .child li:first-child {
border-top: none;
}
#typecho-nav-list .child li.last {
border-bottom: none;
}
#typecho-nav-list .child li a:hover {
background: #EDF0DF;
background: #62686B;
}
#typecho-nav-list .child li.focus a, #typecho-nav-list .child li.focus a:hover {
/*background: #E68A17;
color: #fff;*/
background: #EDF0DF url(../images/sprite.png) right -413px no-repeat;
background: #62686B;
}
#typecho-nav-list .child li a {
text-decoration: none;
color: #333;
color: #FFF;
display: block;
padding: 0 37px 0 7px;
zoom: 1;
padding: 0 20px;
overflow: hidden;
text-overflow : ellipsis;
white-space:nowrap;
height: 29px;
line-height: 29px;
white-space: nowrap;
height: 40px;
line-height: 40px;
}
.typecho-head-nav .operate {
color: #ccc;
position:absolute;
position: absolute;
font-size: 13px;
top: 0px;
right: 0;
/* review IE */
*right: 25px;
height: 30px;
line-height: 30px;
}
.typecho-head-nav .operate a.exit {
@@ -960,23 +808,11 @@ margin-top: 25px;
* 注脚
*/
.typecho-foot {
padding: 15px 25px 80px 25px;
padding: 50px 0 80px;
text-align: center;
color: #999;
}
.typecho-foot h4 {
margin: 5px auto;
}
.typecho-foot h4 a {
margin: 0px auto;
}
.typecho-foot em {
color: #fff;
}
/*
.typecho-foot .copyright {
@@ -987,33 +823,7 @@ margin-top: 25px;
}
*/
.typecho-foot .resource ul {
margin: 5px auto;
text-align: center;
position: relative;
overflow: hidden;
display: inline-block;
*display: inline;
*zoom: 1;
}
.typecho-foot .resource li {
font-size: 13px;
left: -6px;
position: relative;
float: left;
padding: 0px 5px;
line-height: 16px;
border-left: 1px solid #505050;
}
.typecho-foot .resource li a:link, .typecho-foot .resource li a:visited {
color: #999;
}
.typecho-foot .resource li a:hover, .typecho-foot .resource li a:active {
color: #fff;
}
.typecho-foot-v2 {
text-align: left;
@@ -1036,6 +846,7 @@ margin-top: 25px;
* 标题
*/
.typecho-page-title {
margin-top: 20px;
}
@@ -1043,43 +854,27 @@ margin-top: 25px;
* 后台页面主体
*/
.typecho-page-main {
margin: 10px auto;
padding-bottom: 10px;
}
.typecho-page-main .typecho-option-tabs {
font-size: 13px;
font-weight: bold;
margin-bottom: 15px;
}
/**
* 后台主页左侧导航列表
*/
.typecho-dashboard-nav h3 {
font-size: 14px;
font-weight: bold;
margin-bottom: 10px;
}
.typecho-dashboard-nav h3.intro {
font-size: 13px;
font-weight: normal;
}
.typecho-dashboard-nav .intro-link {
background: none;
padding: 0px;
font-size: 13px;
margin-bottom: 20px;
}
.typecho-dashboard-nav .intro-link ul {
}
.typecho-dashboard-nav .intro-link li {
border: none;
margin: 2px 0px;
}
.typecho-dashboard-nav .balloon,
@@ -1095,7 +890,6 @@ margin-top: 25px;
}
.typecho-dashboard-nav .dashboard-status {
font-size: 13px;
}
.typecho-dashboard-nav .status p {
@@ -1103,12 +897,6 @@ margin-top: 25px;
}
.typecho-dashboard-nav .update-check {
background: #dee4c5;
color:#e47e00;
margin-bottom: 25px;
padding: 10px;
font-size: 13px;
text-align: center;
}
.typecho-dashboard-nav .update-check p {
@@ -1116,21 +904,16 @@ margin-top: 25px;
}
.typecho-dashboard-nav .update-check .current {
font-size: 13px;
font-weight: bold;
}
.typecho-dashboard-nav .update-check .current em {
font-weight: bold;
}
.typecho-dashboard-nav .update-check .latest {
font-size: 13px;
}
.typecho-dashboard-nav .update-check .latest a,
.typecho-dashboard-nav .update-check .latest em {
color: #666;
}
/**
@@ -1141,25 +924,18 @@ margin-top: 25px;
}
.typecho-dashboard-main .section {
font-size: 13px;
margin-bottom: 20px;
}
.typecho-dashboard-main .section h4 {
font-size: 14px;
margin-bottom: 10px;
}
.typecho-dashboard-main .section ul {
}
.typecho-dashboard-main .section li {
text-align: justify;
line-height: 22px;
}
.typecho-dashboard-main .section .tags {
margin: 0px 5px;
}
.typecho-dashboard-main .section .title {
@@ -1268,7 +1044,6 @@ margin-top: 25px;
}
.typecho-list-operate input {
font-size: 13px;
}
.typecho-list-operate button {
@@ -1367,7 +1142,6 @@ a.operate-reply {
}
.typecho-list-table input {
border: none; /* 重置 input */
}
.typecho-list-table thead {
@@ -1588,19 +1362,14 @@ ul.typecho-list-notable li .comment-form, ul.typecho-list-notable li .reply-form
}
ul.typecho-list-notable li .comment-form label, ul.typecho-list-notable li .reply-form label {
padding: 0 10px 0 0;
line-height: 20px;
}
ul.typecho-list-notable li .comment-form input, ul.typecho-list-notable li .reply-form input {
margin: 0 10px 0 0;
width: 155px;
}
ul.typecho-list-notable li .comment-form textarea, ul.typecho-list-notable li .reply-form textarea {
margin: 10px 0;
width: 800px;
height: 150px;
}
ul.typecho-list-notable li .comment-form p, ul.typecho-list-notable li .reply-form p {
@@ -1640,8 +1409,6 @@ ul.typecho-list-notable li #typecho-respond {
}
#typecho-respond textarea {
width: 450px;
height: 150px;
}
/**
@@ -1685,7 +1452,6 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-theme-list h4 {
font-size: 13px;
font-weight: bold;
}
@@ -1722,23 +1488,15 @@ ul.typecho-list-notable li #typecho-respond {
*/
.typecho-page-main .typecho-option {
position: relative;
top: -1px;
font-size: 13px;
border-bottom: 1px solid #EBEFDA;
border-top: 1px solid #fff;
margin-left: auto;
margin-right: auto;
max-width: 600px;
}
.typecho-page-main .typecho-option:first-child {
border-top: none;
}
.typecho-page-main .typecho-option-clear {
border-bottom: 1px solid #F7FBE9;
border-top: 1px solid #F7FBE9;
margin: -1px 0;
top: -1px;
bottom: -1px;
z-index: 100;
}
.typecho-page-main .typecho-mini-panel {
@@ -1746,24 +1504,13 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-page-main .typecho-option label.typecho-label {
width: 190px;
margin-left: -200px;
font-weight: bold;
}
.typecho-page-main .typecho-mini-panel .typecho-option label.typecho-label {
float: none;
margin: 0;
width: auto;
display: block;
text-align:left;
}
.typecho-page-main .typecho-option li {
margin: 15px 0px;
_padding-bottom: 5px;
display: block;
padding-left: 200px;
}
.typecho-page-main .typecho-mini-panel .typecho-option {
@@ -1776,86 +1523,57 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-page-main .typecho-option input.text {
width: 475px;
width: 100%;
}
.typecho-page-main .typecho-option input.password {
width: 300px;
}
.typecho-page-main .typecho-mini-panel .typecho-option input.text {
width: 280px;
}
.typecho-page-main .typecho-mini-panel .typecho-option input.password {
width: 200px;
}
.typecho-page-main .typecho-option input.mini {
width: 115px;
width: 100px;
}
.typecho-page-main .typecho-option input.num {
width: 30px;
width: 40px;
}
.typecho-page-main .typecho-option textarea {
width: 475px;
height: 150px;
width: 100%;
height: 100px;
}
.typecho-page-main .typecho-option span.multiline {
*float: left;
display: block;
line-height: 26px;
*width: 100%;
margin: .3em 0;
}
.typecho-page-main .typecho-mini-panel .typecho-option textarea {
width: 280px;
height: 70px;
}
.typecho-page-main .typecho-option .description {
line-height:18px;
margin-top:5px;
text-align:justify;
}
.typecho-page-main .typecho-option-submit {
border-bottom: none;
}
.typecho-page-main .typecho-option li.typecho-option-title {
padding: 10px;
background: #DEE4C5;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
/* hope IE support border radius, God save me! */
border-radius: 4px;
}
.typecho-page-main .typecho-option li.typecho-option-title h3 {
font-size: 18px;
color: #e47e00;
}
.typecho-page-main .typecho-option li.typecho-option-title p {
font-size: 13px;
color: #555555;
padding: 0;
margin: 5px 0 0 0;
padding-left: 2px;
}
.typecho-page-main .typecho-content-panel .typecho-option label.typecho-label {
width: 100px;
margin-left: -110px;
position: absolute;
}
.typecho-page-main .typecho-content-panel ul.typecho-option {
@@ -1969,8 +1687,6 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-edit-theme textarea {
width: 770px;
height: 500px;
}
/**
@@ -1982,10 +1698,6 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-post-area label.typecho-label {
font-size: 13px;
font-weight: bold;
margin: 5px 0px;
display: block;
}
/*.typecho-post-area .typecho-preview-label {
@@ -2002,9 +1714,6 @@ ul.typecho-list-notable li #typecho-respond {
}*/
.typecho-post-area .typecho-preview-label {
margin-right: 10px;
font-weight: bold;
text-decoration: underline;
}
#typecho-preview-box {
@@ -2057,10 +1766,6 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-post-area label.typecho-label cite {
font-weight: normal;
color: #777;
margin-left: 10px;
background: #ffffdd;
}
.typecho-post-area .submit {
@@ -2079,8 +1784,6 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-post-area input.text {
font-size: 13px;
width: 700px;
}
.typecho-post-area .out-date {
@@ -2090,7 +1793,6 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-post-area p.title {
margin-bottom: 10px;
}
.typecho-post-area input#year,
@@ -2098,41 +1800,28 @@ ul.typecho-list-notable li #typecho-respond {
.typecho-post-area input#day,
.typecho-post-area input#hour,
.typecho-post-area input#min {
width: 30px;
font-size: 8pt;
font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
padding: 1px;
}
.typecho-post-area input#day,
.typecho-post-area input#hour,
.typecho-post-area input#min {
width: 16px;
}
.typecho-post-area select#month {
width: 64px;
}
.typecho-post-area input.time {
width: 20px;
}
.typecho-post-area input.mini {
width: 200px;
}
.typecho-post-area input.title {
font-size: 20px; /* 撰写页面标题input */
font-size: 1.17em;
font-weight: bold;
}
.typecho-post-area textarea#text {
font-size: 13px;
line-height: 18px;
width: 700px;
margin: 0;
*margin: -1px 0 -1px 0;
display: block;
}
.typecho-post-area button#btn-submit {
@@ -2144,24 +1833,12 @@ ul.typecho-list-notable li #typecho-respond {
}
.typecho-post-area span.size-btn {
height: 20px;
width: 708px;
line-height: 20px;
background: url(../images/size-btn.gif) top no-repeat;
position: relative;
display: block;
cursor: row-resize;
}
.typecho-post-area textarea#trackback {
font-size: 13px;
width: 430px;
height: 70px;
}
.typecho-post-area br {
height: 10px;
line-height: 10px;
}
.typecho-post-area #advance-panel, .typecho-post-area #upload-panel {
@@ -2174,23 +1851,15 @@ ul.typecho-list-notable li #typecho-respond {
}
ul.typecho-post-option {
border: 0px;
margin: -1px 0px -1px 10px;
}
ul.typecho-post-option li {
list-style: none;
border-bottom: 1px solid #EBEFDA;
border-top: 1px solid #fff;
padding: 5px 0 10px 0;
}
ul.typecho-post-option li:first-child {
border-top: none;
}
ul.typecho-post-option li:last-child {
border-bottom: none;
}
#advance-panel li, #upload-panel li {
@@ -2198,43 +1867,24 @@ ul.typecho-post-option li:last-child {
}
ul.typecho-post-option li ul {
border: none;
margin: 0;
}
ul.typecho-post-option li ul.related {
margin: 10px 0 0 0;
}
ul.typecho-post-option li ul li {
/*height: 20px;
line-height: 20px;*/
border: none;
font-size: 13px;
padding: 4px;
margin-bottom: 5px;
background: #EFF5D9;
}
ul.typecho-post-option li ul.related li {
background: none;
list-style-type: square;
padding: 0;
margin: 0 0 0 20px;
height: auto;
}
ul.typecho-post-option li ul li:hover {
background: #E3EEBD
}
ul.typecho-post-option li ul.related li:hover {
background: none;
}
ul.typecho-post-option .description {
color: #999;
margin-top: 5px;
}
ul.autocompleter-choices {
@@ -2388,25 +2038,15 @@ ul.autocompleter-choices span.autocompleter-queried {
}
.typecho-attachment-photo-box .description {
color: #999;
margin: 10px 0;
font-size: 14px;
}
.typecho-attachment-photo-box .description ul li {
border-bottom: 1px dashed #E8EDD6;
line-height: 28px;
height: 28px;
}
.typecho-attachment-photo-box .description strong {
color: #444;
font-weight: normal;
}
.typecho-attachment-photo-box .description input {
width: 500px;
border: 1px solid #aaa;
background-color: #eee;
background-image: url(../images/progress.gif);
background-repeat: repeat-y;
admin/index.php
+3 -3
View File
@@ -10,7 +10,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main">
<div class="col-3 typecho-dashboard-nav suffix">
<h3 class="intro"><?php _e('欢迎使用 Typecho, 您可以使用下面的链接开始您的 Blog 之旅:'); ?></h3>
<p class="intro"><?php _e('欢迎使用 Typecho, 您可以使用下面的链接开始您的 Blog 之旅:'); ?></p>
<div class="intro-link">
<ul>
@@ -61,7 +61,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<div class="col-6 typecho-dashboard-main">
<div class="section">
<h4><?php _e('最近发表的文章'); ?></h4>
<h3><?php _e('最近发表的文章'); ?></h3>
<?php Typecho_Widget::widget('Widget_Contents_Post_Recent', 'pageSize=5')->to($posts); ?>
<ul>
<?php if($posts->have()): ?>
@@ -75,7 +75,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
</ul>
</div>
<div class="section">
<h4><?php _e('最新得到的回复'); ?></h4>
<h3><?php _e('最新得到的回复'); ?></h3>
<ul>
<?php Typecho_Widget::widget('Widget_Comments_Recent', 'pageSize=5')->to($comments); ?>
<?php if($comments->have()): ?>
admin/options-general.php
+1 -1
View File
@@ -8,7 +8,7 @@ include 'menu.php';
<div class="body container">
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main">
<div class="col-12 start-02">
<div class="col-12">
<?php Typecho_Widget::widget('Widget_Options_General')->form()->render(); ?>
</div>
</div>
admin/scss/grid.scss
+41 -1
View File
@@ -15,7 +15,8 @@ $gutter-width: 20px;
// Break point
$screen-tablet: 768px;
$screen-desktop: 992px; // Not implemented yet
$screen-desktop: 992px;
$screen-wide: 1200px;
// Column group
.col-group {
@@ -136,6 +137,45 @@ $screen-desktop: 992px; // Not implemented yet
}
/*
* Widescreen and up
*/
@media (min-width: $screen-wide) {
.container {
max-width: $screen-wide - ($gutter-width * 2);
}
// Colunms
@for $index from 1 through $columns {
.col-wd-#{$index} {
width: $column-width * $index;
}
}
// Offset
@for $index from 0 through $columns {
.col-offset-#{$index} {
margin-left: $column-width * $index;
}
}
// Pull
@for $index from 0 through $columns {
.col-pull-#{$index} {
right: $column-width * $index;
}
}
// Push
@for $index from 0 through $columns {
.col-push-#{$index} {
left: $column-width * $index;
}
}
}
// Clearfix
.clearfix {
zoom: 1;
admin/write-post.php
+13 -13
View File
@@ -18,11 +18,11 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
Typecho_Common::url('/action/contents-post-edit?do=deleteDraft&cid=' . $post->cid, $options->index)); ?></cite>
<?php endif; ?>
</label>
<p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($post->title); ?>" class="text title" /></p>
<p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($post->title); ?>" class="w-100 text title" /></p>
<label for="text" class="typecho-label"><?php _e('内容'); ?><cite id="auto-save-message"></cite></label>
<p><textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text"><?php echo htmlspecialchars($post->text); ?></textarea></p>
<p><textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100"><?php echo htmlspecialchars($post->text); ?></textarea></p>
<label for="tags" class="typecho-label"><?php _e('标签'); ?></label>
<p><input id="tags" name="tags" type="text" value="<?php $post->tags(',', false); ?>" class="text" /></p>
<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">
<span class="left">
@@ -79,8 +79,8 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
<div id="typecho-preview-box"></div>
</div>
<div class="col-3">
<ul class="typecho-post-option">
<li>
<div class="typecho-post-option">
<section>
<label for="date" class="typecho-label"><?php _e('日期'); ?></label>
<p>
<select disabled class="typecho-date" name="month" id="month">
@@ -106,8 +106,8 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
<input disabled class="typecho-date" size="2" maxlength="2" type="text" name="min" id="min" value="<?php $post->date('i'); ?>" />
</p>
<p class="description"><?php _e('请选择一个发布日期'); ?></p>
</li>
<li>
</section>
<section>
<label class="typecho-label"><?php _e('分类'); ?></label>
<?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($category); ?>
<ul<?php if ($category->length > 8): ?> style="height: 264px"<?php endif; ?>>
@@ -123,22 +123,22 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
<label for="category-<?php $category->mid(); ?>"><?php $category->name(); ?></label></li>
<?php endwhile; ?>
</ul>
</li>
<li>
</section>
<section>
<label for="slug" class="typecho-label"><?php _e('缩略名'); ?></label>
<p><input type="text" id="slug" name="slug" value="<?php $post->slug(); ?>" class="mini" /></p>
<p class="description"><?php _e('为这篇日志自定义链接地址, 有利于搜索引擎收录'); ?></p>
</li>
</section>
<?php Typecho_Plugin::factory('admin/write-post.php')->option($post); ?>
<?php if($post->have()): ?>
<?php $modified = new Typecho_Date($post->modified); ?>
<li>
<section>
<label class="typecho-label"><?php _e('本文由 <a href="%s">%s</a> 撰写',
Typecho_Common::url('manage-posts.php?uid=' . $post->author->uid, $options->adminUrl), $post->author->screenName); ?></label>
<p class="description"><?php _e('最后修改于 %s', $modified->word()); ?></p>
</li>
</section>
<?php endif; ?>
</ul>
</div>
</div>
</form>
</div>
var/Widget/Menu.php
+2 -2
View File
@@ -283,7 +283,7 @@ class Widget_Menu extends Typecho_Widget
}
echo "<ul class=\"root" . ($key == $this->_currentParent ? ' ' . $class : NULL)
. "\"><li class=\"parent\"><a href=\"{$node[2]}\" title=\"{$node[0]}\">{$node[0]}</a></dt>"
. "\"><li class=\"parent\"><a href=\"{$node[2]}\">{$node[0]}</a></dt>"
. "</li><ul class=\"child\">";
$last = 0;
@@ -308,7 +308,7 @@ class Widget_Menu extends Typecho_Widget
}
echo "<li" . (!empty($classes) ? ' class="' . implode(' ', $classes) . '"' : NULL) .
"><a href=\"" . ($key == $this->_currentParent && $inKey == $this->_currentChild ? $this->_currentUrl : $inNode[2]) . "\" title=\"{$inNode[0]}\">{$inNode[0]}</a></li>";
"><a href=\"" . ($key == $this->_currentParent && $inKey == $this->_currentChild ? $this->_currentUrl : $inNode[2]) . "\">{$inNode[0]}</a></li>";
}
echo "</ul></ul>";
var/Widget/Options/Discussion.php
+5 -5
View File
@@ -57,13 +57,13 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge
<label for="commentsShow-commentsAvatarRating">'),
'commentsPageBreak' => _t('启用分页, 并且每页显示 %s 篇评论, 在列出时将 %s 作为默认显示',
'</label><input type="text" value="' . $this->options->commentsPageSize
. '" class="text num" id="commentsShow-commentsPageSize" name="commentsPageSize" /><label for="commentsShow-commentsPageSize">',
. '" class="text num text-s" id="commentsShow-commentsPageSize" name="commentsPageSize" /><label for="commentsShow-commentsPageSize">',
'</label><select id="commentsShow-commentsPageDisplay" name="commentsPageDisplay">
<option value="first"' . ('first' == $this->options->commentsPageDisplay ? ' selected="true"' : '') . '>' . _t('第一页') . '</option>
<option value="last"' . ('last' == $this->options->commentsPageDisplay ? ' selected="true"' : '') . '>' . _t('最后一页') . '</option></select>'
. '<label for="commentsShow-commentsPageDisplay">'),
'commentsThreaded' => _t('启用评论回复, 以 %s 层作为每个评论最多的回复层数',
'</label><input name="commentsMaxNestingLevels" type="text" class="text num" value="' . $this->options->commentsMaxNestingLevels . '" id="commentsShow-commentsMaxNestingLevels" />
'</label><input name="commentsMaxNestingLevels" type="text" class="text num text-s" value="' . $this->options->commentsMaxNestingLevels . '" id="commentsShow-commentsMaxNestingLevels" />
<label for="commentsShow-commentsMaxNestingLevels">') . '</label></span><span class="multiline">'
. _t('将 %s 的评论显示在前面', '<select id="commentsShow-commentsOrder" name="commentsOrder">
<option value="DESC"' . ('DESC' == $this->options->commentsOrder ? ' selected="true"' : '') . '>' . _t('较新的') . '</option>
@@ -107,10 +107,10 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge
'commentsRequireURL' => _t('必须填写网址'),
'commentsCheckReferer' => _t('检查评论来源页URL是否与文章链接一致'),
'commentsAutoClose' => _t('在文章发布 %s 天以后自动关闭评论',
'</label><input name="commentsPostTimeout" type="text" class="text num" value="' . intval($this->options->commentsPostTimeout / (24 * 3600)) . '" id="commentsPost-commentsPostTimeout" />
'</label><input name="commentsPostTimeout" type="text" class="text num text-s" value="' . intval($this->options->commentsPostTimeout / (24 * 3600)) . '" id="commentsPost-commentsPostTimeout" />
<label for="commentsPost-commentsPostTimeout">'),
'commentsPostIntervalEnable' => _t('同一IP发布评论的时间间隔限制为 %s 分钟',
'</label><input name="commentsPostInterval" type="text" class="text num" value="' . round($this->options->commentsPostInterval / (60), 1) . '" id="commentsPost-commentsPostInterval" />
'</label><input name="commentsPostInterval" type="text" class="text num text-s" value="' . round($this->options->commentsPostInterval / (60), 1) . '" id="commentsPost-commentsPostInterval" />
<label for="commentsPost-commentsPostInterval">')
);
@@ -151,7 +151,7 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge
$commentsHTMLTagAllowed = new Typecho_Widget_Helper_Form_Element_Textarea('commentsHTMLTagAllowed', NULL,
htmlspecialchars($this->options->commentsHTMLTagAllowed),
_t('允许使用的HTML标签和属性'), _t('默认的用户评论不允许填写任何的HTML标签, 你可以在这里填写允许使用的HTML标签.<br />
比如: &lt;a href=&quot;&quot;&gt; &lt;img src=&quot;&quot;&gt; &lt;blockquote&gt;'));
比如: <code>&lt;a href=&quot;&quot;&gt; &lt;img src=&quot;&quot;&gt; &lt;blockquote&gt;</code>'));
$form->addInput($commentsHTMLTagAllowed);
/** 提交按钮 */
var/Widget/Options/General.php
+5 -5
View File
@@ -106,14 +106,14 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
}
$attachmentTypesOptions = array(
'@image@' => _t('图片文件') . ' <strong><small>gif jpg png tiff bmp</small></strong>',
'@media@' => _t('多媒体文件') . ' <strong><small>mp3 wmv wma rmvb rm avi flv</small></strong>',
'@doc@' => _t('常用档案文件') . ' <strong><small>txt doc docx xls xlsx ppt pptx zip rar pdf</small></strong>',
'@other@' => _t('其他格式 %s', '<input type="text" style="width: 250px;" name="attachmentTypesOther" value="' . htmlspecialchars($attachmentTypesOtherValue) . '" />'),
'@image@' => _t('图片文件') . ' <code>(gif jpg png tiff bmp)</code>',
'@media@' => _t('多媒体文件') . ' <code>(mp3 wmv wma rmvb rm avi flv)</code>',
'@doc@' => _t('常用档案文件') . ' <code>(txt doc docx xls xlsx ppt pptx zip rar pdf)</code>',
'@other@' => _t('其他格式 %s', ' <input type="text" class="w-40 text-s mono" name="attachmentTypesOther" value="' . htmlspecialchars($attachmentTypesOtherValue) . '" />'),
);
$attachmentTypes = new Typecho_Widget_Helper_Form_Element_Checkbox('attachmentTypes', $attachmentTypesOptions,
$attachmentTypesOptionsValue, _t('允许上传的文件类型'), _t('用逗号 "," 将后缀名隔开, 例如: cpp,h,mak'));
$attachmentTypesOptionsValue, _t('允许上传的文件类型'), _t('用逗号 "," 将后缀名隔开, 例如: <code>cpp, h, mak</code>'));
$form->addInput($attachmentTypes->multiMode());
/** 提交按钮 */
var/Widget/Options/Permalink.php
+7 -7
View File
@@ -198,10 +198,10 @@ RewriteRule . {$basePath}index.php [L]
$errorStr .= _t('<br />如果你仍然想启用此功能, <a href="%s">请点击这里</a>', Typecho_Common::url('index.php/action/options-permalink?do=enableRewriteAnyway', $this->options->siteUrl));
$form->addInput($rewrite->addRule(array($this, 'checkRewrite'), $errorStr));
$patterns = array('/archives/[cid:digital]/' => _t('默认风格') . ' <strong><small>/archives/{cid}/</small></strong>',
'/archives/[slug].html' => _t('wordpress风格') . ' <strong><small>/archives/{slug}.html</small></strong>',
'/[year:digital:4]/[month:digital:2]/[day:digital:2]/[slug].html' => _t('按日期归档') . ' <strong><small>/archives/{year}/{month}/{day}/{slug}.html</small></strong>',
'/[category]/[slug].html' => _t('按分类归档') . ' <strong><small>/{category}/{slug}.html</small></strong>');
$patterns = array('/archives/[cid:digital]/' => _t('默认风格') . ' <code>/archives/{cid}/</code>',
'/archives/[slug].html' => _t('wordpress风格') . ' <code>/archives/{slug}.html</code>',
'/[year:digital:4]/[month:digital:2]/[day:digital:2]/[slug].html' => _t('按日期归档') . ' <code>/archives/{year}/{month}/{day}/{slug}.html</code>',
'/[category]/[slug].html' => _t('按分类归档') . ' <code>/{category}/{slug}.html</code>');
/** 自定义文章路径 */
$postPatternValue = $this->options->routingTable['post']['url'];
@@ -214,7 +214,7 @@ RewriteRule . {$basePath}index.php [L]
} else if (!isset($patterns[$postPatternValue])) {
$customPatternValue = $this->decodeRule($postPatternValue);
}
$patterns['custom'] = _t('个性化定义') . ' <input type="text" style="width: 250px;" name="customPattern" value="' . $customPatternValue . '" />';
$patterns['custom'] = _t('个性化定义') . ' <input type="text" class="w-40 text-s" name="customPattern" value="' . $customPatternValue . '" />';
$postPattern = new Typecho_Widget_Helper_Form_Element_Radio('postPattern', $patterns,
$postPatternValue, _t('自定义文章路径'), _t('可用参数：{cid} 日志ID、{slug} 日志缩略名、{category} 分类、{year} 年、{month} 月、{day} 日<br />选择一种合适的文章静态路径风格, 使得你的网站链接更加友好.<br />
@@ -228,8 +228,8 @@ RewriteRule . {$basePath}index.php [L]
$pageSuffixValue = false !== ($pos = strrpos($this->options->routingTable['page']['url'], '.')) ?
substr($this->options->routingTable['page']['url'], $pos) : '/';
$pageSuffix = new Typecho_Widget_Helper_Form_Element_Radio('pageSuffix',
array('/' => '<strong>' . _t('无') . '</strong>', '.html' => '<strong>html</strong>',
'.htm' => '<strong>htm</strong>', '.php' => '<strong>php</strong>'), $pageSuffixValue,
array('/' => '<strong>' . _t('无') . '</strong>', '.html' => '<code>html</code>',
'.htm' => '<code>htm</code>', '.php' => '<code>php</code>'), $pageSuffixValue,
_t('独立页面后缀名'), _t('给独立页面设置一种文件后缀名, 使得它看起来像
<br /><strong>%s</strong>',
Typecho_Common::url('example.html', $this->options->index)));