From 38a2798dc91b9696ec136e2de72012ebd3abb644 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Thu, 10 Oct 2013 20:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E8=89=B2=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin/css/style.css | 92 +++++++++---------------------------------
admin/manage-metas.php | 2 +-
admin/media.php | 2 +-
admin/menu.php | 10 +++--
admin/page-title.php | 1 -
admin/profile.php | 2 +-
admin/write-page.php | 12 +++---
admin/write-post.php | 12 +++---
8 files changed, 40 insertions(+), 93 deletions(-)
diff --git a/admin/css/style.css b/admin/css/style.css
index 00a8369c..aea50edd 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -17,16 +17,10 @@ html {
}
body {
- /*
- background: #f7fbe9;
- color: #333;
- */
- font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
- background: #333;
- color: #f7fbe9;
- /*
- overflow-x: hidden;
- */
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ background: #F9F9F7;
+ color: #444;
+ font-size: 87.5%;
}
/*
@@ -37,8 +31,6 @@ body > div {
*/
body.bright, .main {
- background: #f7fbe9;
- color: #333;
}
.main:after {
@@ -83,11 +75,12 @@ p {
}
a {
- color: #BD6800;
+ color: #467B96;
text-decoration: none;
}
a:hover {
+ color: #6DA1BB;
text-decoration: underline;
}
@@ -832,20 +825,20 @@ margin-top: 25px;
* 后台头部导航
*/
.typecho-head-nav {
- position: relative;
- height: 30px;
- font-size: 13px;
- background: #333;
- color: #fff;
- z-index: 250; /* IE 是个 250 */
- /*border-bottom: 1px solid #DCE2C0;*/
+ height: 40px;
+ background: #363636;
}
.typecho-nav-list {
- /*margin-left:10px;*/
zoom: 1;
}
+#typecho-nav-list ul {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
#typecho-nav-list .root {
position: relative;
float: left;
@@ -856,9 +849,9 @@ margin-top: 25px;
}
#typecho-nav-list .parent a {
- color: #fff;
- height: 30px;
- line-height: 30px;
+ color: #CCC;
+ height: 40px;
+ line-height: 40px;
display: block;
outline: none;
padding: 0 30px;
@@ -876,11 +869,10 @@ margin-top: 25px;
border: 1px solid #CED7A8;
border-top: none;
background: #DCE2C0;
- font-size: 13px;
overflow: hidden;
padding: 10px;
z-index: 250;
- top: 30px;
+ top: 40px;
width: 160px;
-moz-border-radius-bottomleft: 3px;
-moz-border-radius-bottomright: 3px;
@@ -968,16 +960,9 @@ margin-top: 25px;
* 注脚
*/
.typecho-foot {
- background: #333333;
padding: 15px 25px 80px 25px;
- font-size: 13px;
text-align: center;
color: #999;
- /*
- position: absolute;
- height: 100%;
- width: 100%;
- */
}
.typecho-foot h4 {
@@ -1051,47 +1036,6 @@ margin-top: 25px;
* 标题
*/
.typecho-page-title {
- margin-top: 30px;
-}
-
-.typecho-page-title div {
- height: 30px;
- background: url(../images/sprite.png) repeat-x scroll 0px -1483px;
-}
-
-.typecho-page-title div a {
- color: #E47E00;
-}
-
-.typecho-page-title h2 {
- background: #f7fbe9;
- padding-right: 10px;
- font-size: 16px;
- line-height: 30px;
- height: 30px;
- float: left;
-}
-
-.typecho-page-title p {
- height: 30px;
- float: right;
- background: #f7fbe9;
- padding-left: 10px;
-}
-
-.typecho-page-title a {
- font-size: 13px;
- line-height: 30px;
- font-weight: bold;
-}
-
-.typecho-page-title a:hover {
- text-decoration: underline;
-}
-
-.typecho-page-title h2 a {
- font-size: 14px;
- margin-left: 13px;
}
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index b664e5a0..3d1541c7 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -8,7 +8,7 @@ include 'menu.php';
<div class="body container">
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main manage-metas">
- <div class="col-16 suffix">
+ <div class="col-8 suffix">
<ul class="typecho-option-tabs">
<li<?php if(!isset($request->type) || 'category' == $request->get('type')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-metas.php'); ?>"><?php _e('分类'); ?></a></li>
<li<?php if('tag' == $request->get('type')): ?> class="current"<?php endif; ?>><a href="<?php $options->adminUrl('manage-metas.php?type=tag'); ?>"><?php _e('标签'); ?></a></li>
diff --git a/admin/media.php b/admin/media.php
index 0e5f5400..14ad3ad6 100644
--- a/admin/media.php
+++ b/admin/media.php
@@ -10,7 +10,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
<div class="body container">
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main">
- <div class="col-16 suffix">
+ <div class="col-8 suffix">
<div class="typecho-attachment-photo-box">
<?php if ($attachment->attachment->isImage): ?>
<img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" />
diff --git a/admin/menu.php b/admin/menu.php
index d21e110d..a1d36ef5 100644
--- a/admin/menu.php
+++ b/admin/menu.php
@@ -1,8 +1,12 @@
<?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
-<div class="typecho-head-nav container">
+<div class="typecho-head-nav">
<div id="typecho-nav-list">
<?php $menu->output(); ?>
</div>
- <p 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(); ?>" title="<?php _e('登出'); ?>"><?php _e('登出'); ?></a></p>
+ <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(); ?>" title="<?php _e('登出'); ?>"><?php _e('登出'); ?></a>
+ </div>
+ <a href="<?php $options->siteUrl(); ?>"><?php _e('查看我的站点'); ?></a>
</div>
diff --git a/admin/page-title.php b/admin/page-title.php
index 7ac436ab..3688c389 100644
--- a/admin/page-title.php
+++ b/admin/page-title.php
@@ -13,6 +13,5 @@
echo "<a href=\"{$menu->addLink}\">" . _t("新增") . "</a>";
}
?></h2>
- <p><a href="<?php $options->siteUrl(); ?>"><?php _e('查看我的站点'); ?></a></p>
</div>
</div>
diff --git a/admin/profile.php b/admin/profile.php
index dd1d5d35..a63e98f7 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -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-16 suffix typecho-content-panel">
+ <div class="col-8 suffix typecho-content-panel">
<h4>
<?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=50&r=X' .
'&d=" alt="' . $user->screenName . '" width="50" height="50" />'; ?>
diff --git a/admin/write-page.php b/admin/write-page.php
index 67b4e5d6..6d5447a6 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -9,8 +9,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main typecho-post-option typecho-post-area">
<form action="<?php $options->index('/action/contents-page-edit'); ?>" method="post" name="write_page">
- <div class="col-18 suffix">
- <div class="col-18">
+ <div class="col-9 suffix">
+ <div>
<label for="title" class="typecho-label"><?php _e('标题'); ?>
<?php if ($page->draft && $page->draft['cid'] != $page->cid): ?>
<?php $pageModifyDate = new Typecho_Date($page->draft['modified']); ?>
@@ -37,8 +37,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
</p>
</div>
- <ul id="advance-panel" class="typecho-post-option col-18">
- <li class="col-18">
+ <ul id="advance-panel" class="typecho-post-option col-9">
+ <li class="col-9">
<div class="col-12">
<label for="order" class="typecho-label"><?php _e('页面顺序'); ?></label>
<p><input type="text" id="order" name="order" value="<?php $page->order(); ?>" class="mini" /></p>
@@ -70,8 +70,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
</div>
</li>
</ul>
- <ul id="upload-panel" class="col-18">
- <li class="col-18">
+ <ul id="upload-panel" class="col-9">
+ <li class="col-9">
<?php include 'file-upload.php'; ?>
</li>
</ul>
diff --git a/admin/write-post.php b/admin/write-post.php
index 99630f11..949fc470 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -9,8 +9,8 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main typecho-post-option typecho-post-area">
<form action="<?php $options->index('/action/contents-post-edit'); ?>" method="post" name="write_post">
- <div class="col-18 suffix" id="test">
- <div class="col-18">
+ <div class="col-9 suffix" id="test">
+ <div>
<label for="title" class="typecho-label"><?php _e('标题'); ?>
<?php if ($post->draft && $post->draft['cid'] != $post->cid): ?>
<?php $postModifyDate = new Typecho_Date($post->draft['modified']); ?>
@@ -38,8 +38,8 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
</span>
</p>
</div>
- <ul id="advance-panel" class="typecho-post-option col-18">
- <li class="col-18">
+ <ul id="advance-panel" class="typecho-post-option col-9">
+ <li class="col-9">
<div class="col-12 suffix">
<?php if($user->pass('editor', true)): ?>
<label class="typecho-label"><?php _e('公开度'); ?></label>
@@ -71,8 +71,8 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
</div>
</li>
</ul>
- <ul id="upload-panel" class="col-18">
- <li class="col-18">
+ <ul id="upload-panel" class="col-9">
+ <li class="col-9">
<?php include 'file-upload.php'; ?>
</li>
</ul>