From db3bbc8da2e384b9bc36ea83549c911df073bfa7 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Thu, 17 Oct 2013 12:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E8=A3=85=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=20=E4=BF=AE=E5=A4=8D=E6=AC=A2=E8=BF=8E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css | 51 +++++++++++++++++++++++++++++++--------------
 admin/welcome.php   | 20 +++++++-----------
 install.php         | 13 ++++++------
 3 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index 5b2d5f99..051fceb9 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -385,13 +385,8 @@ button.primary:active, button.primary.active {
 }
 
 .message a {
-    border-bottom: 1px dashed #aaa;
-    line-height: 20px;
-}
-
-.message a:hover {
-    text-decoration: none;
-    border-style: solid;
+    font-weight: bold;
+    text-decoration: underline;
 }
 
 .message blockquote {
@@ -407,7 +402,6 @@ button.primary:active, button.primary.active {
 
 .error a {
     color: #8A1F11;
-    border-color:#8A1F11;
 }
 
 .notice {
@@ -418,7 +412,6 @@ button.primary:active, button.primary.active {
 
 .notice a {
     color: #514721;
-    border-color:#514721;
 }
 
 .success {
@@ -429,7 +422,6 @@ button.primary:active, button.primary.active {
 
 .success a {
     color: #264409;
-    border-color:#264409;
 }
 
 /** 增加顶部消息样式 by 70 */
@@ -467,18 +459,39 @@ button.primary:active, button.primary.active {
  * 安装向导
  */
 .typecho-install-patch {
-    
+    margin-bottom: 2em;
+    padding: 2em 0;
+    background-color: #292D33;
+    color: #FFF;
+    text-align: center;
 }
 
 .typecho-install-patch ol {
-    
+    list-style: none;
+    margin: 3em 0 1em;
+    padding: 0;
+    color: #999;
 }
-
 .typecho-install-patch li {
-    
+    display: inline-block;
+    margin: 0 .8em;
+}
+.typecho-install-patch span {
+    display: inline-block;
+    margin-right: 5px;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    border: 2px solid #999;
+    text-align: center;
+    border-radius: 2em;
 }
-
 .typecho-install-patch li.current {
+    color: #FFF;
+    font-weight: bold;
+}
+.typecho-install-patch li.current span {
+    border-color: #FFF;
 }
 
 
@@ -537,9 +550,15 @@ margin-top: 25px;
  */
 
 /**
- * @安装样式结束
+ * 欢迎界面
  */
 
+#typecho-welcome {
+    margin: 1em 0;
+    padding: 1em 2em;
+    background-color: #E9E9E6;
+}
+
 /**
  * 后台分页
  */
diff --git a/admin/welcome.php b/admin/welcome.php
index 79b4aa4a..72309c23 100644
--- a/admin/welcome.php
+++ b/admin/welcome.php
@@ -9,22 +9,18 @@ include 'menu.php';
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
             <div class="col-mb-12">
-                <div class="message success typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
+                <div id="typecho-welcome" class="message">
                     <form action="<?php $options->adminUrl(); ?>" method="get">
-                    <h6><?php _e('欢迎您使用 "%s" 管理后台!', $options->title); ?></h6>
-                    <blockquote>
-                    <ul>
-                        <li><strong><?php _e('快速导航'); ?></strong></li>
-                        <li><strong>1.</strong> <a class="operate-delete" href="<?php $options->adminUrl('profile.php#change-password'); ?>"><?php _e('强烈建议更改你的默认密码'); ?></a></li>
+                    <h3><?php _e('欢迎您使用 "%s" 管理后台: ', $options->title); ?></h3>
+                    <ol>
+                        <li><a class="operate-delete" href="<?php $options->adminUrl('profile.php#change-password'); ?>"><?php _e('强烈建议更改你的默认密码'); ?></a></li>
                         <?php if($user->pass('contributor', true)): ?>
-                        <li><strong>2.</strong> <a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写第一篇日志'); ?></a></li>
-                        <li><strong>3.</strong> <a href="<?php $options->siteUrl(); ?>"><?php _e('查看我的站点'); ?></a></li>
+                        <li><a href="<?php $options->adminUrl('write-post.php'); ?>"><?php _e('撰写第一篇日志'); ?></a></li>
+                        <li><a href="<?php $options->siteUrl(); ?>"><?php _e('查看我的站点'); ?></a></li>
                         <?php else: ?>
-                        <li><strong>2.</strong> <a href="<?php $options->siteUrl(); ?>"><?php _e('查看我的站点'); ?></a></li>
+                        <li><a href="<?php $options->siteUrl(); ?>"><?php _e('查看我的站点'); ?></a></li>
                         <?php endif; ?>
-                    </ul>
-                    </blockquote>
-                    <br />
+                    </ol>
                     <p><button type="submit"><?php _e('让我直接开始使用吧 &raquo;'); ?></button></p>
                     </form>
                 </div>
diff --git a/install.php b/install.php
index b4469300..aea8369b 100644
--- a/install.php
+++ b/install.php
@@ -160,11 +160,12 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
 </head>
 <body>
 <div class="typecho-install-patch">
+    <h1>Typecho</h1>
     <ol class="path">
-        <li<?php if (!isset($_GET['finish']) && !isset($_GET['config'])) : ?> class="current"<?php endif; ?>><?php _e('欢迎使用'); ?></li>
-        <li<?php if (isset($_GET['config'])) : ?> class="current"<?php endif; ?>><?php _e('初始化您的配置'); ?></li>
-        <li<?php if (isset($_GET['start'])) : ?> class="current"<?php endif; ?>><?php _e('开始安装'); ?></li>
-        <li<?php if (isset($_GET['finish'])) : ?> class="current"<?php endif; ?>><?php _e('安装成功'); ?></li>
+        <li<?php if (!isset($_GET['finish']) && !isset($_GET['config'])) : ?> class="current"<?php endif; ?>><span>1</span><?php _e('欢迎使用'); ?></li>
+        <li<?php if (isset($_GET['config'])) : ?> class="current"<?php endif; ?>><span>2</span><?php _e('初始化配置'); ?></li>
+        <li<?php if (isset($_GET['start'])) : ?> class="current"<?php endif; ?>><span>3</span><?php _e('开始安装'); ?></li>
+        <li<?php if (isset($_GET['finish'])) : ?> class="current"<?php endif; ?>><span>4</span><?php _e('安装成功'); ?></li>
     </ol>
 </div>
 <div class="container">
@@ -188,8 +189,8 @@ list($prefixVersion, $suffixVersion) = explode('/', $currentVersion);
                     <?php else : ?>
                         <ul>
                         <?php if (isset($_REQUEST['user']) && isset($_REQUEST['password'])): ?>
-                            <li><?php _e('您的用户名是'); ?>:<strong><?php echo htmlspecialchars(_r('user')); ?></strong></li>
-                            <li><?php _e('您的密码是'); ?>:<strong><?php echo htmlspecialchars(_r('password')); ?></strong></li>
+                            <li><?php _e('您的用户名是'); ?>: <strong class="mono"><?php echo htmlspecialchars(_r('user')); ?></strong></li>
+                            <li><?php _e('您的密码是'); ?>: <strong class="mono"><?php echo htmlspecialchars(_r('password')); ?></strong></li>
                         <?php endif;?>
                     </ul>
                     <?php endif;?>