From 6b3a81bb4debc7cf8bf6beae2532c0ee2265c4c5 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Mon, 9 Dec 2013 21:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20typecho=20=E6=96=B0=20logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/copyright.php             |  3 +-
 admin/css/style.css             | 62 +++++++++++++++++++++++++--------
 admin/custom-fields-js.php      |  1 +
 admin/custom-fields.php         |  2 +-
 admin/img/typecho-logo.svg      | 10 ++++++
 admin/login.php                 |  2 +-
 admin/register.php              |  2 +-
 admin/scss/_buttons.scss        |  2 +-
 admin/scss/_footer.scss         | 20 ++++++-----
 admin/scss/_icons.scss          | 24 ++++++++++++-
 admin/scss/style.scss           | 13 +++++--
 usr/themes/default/comments.php |  2 +-
 12 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 admin/img/typecho-logo.svg

diff --git a/admin/copyright.php b/admin/copyright.php
index 0856742e..61c04f43 100644
--- a/admin/copyright.php
+++ b/admin/copyright.php
@@ -1,7 +1,8 @@
 <?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div class="typecho-foot" role="contentinfo">
     <div class="copyright">
-        <?php _e('由 <a href="http://typecho.org">%s</a> 强力驱动, 版本 %s (%s)', $options->software, $prefixVersion, $suffixVersion); ?>
+        <a href="http://typecho.org"><i class="i-logo-s"></i></a>
+        <p><?php _e('由 <a href="http://typecho.org">%s</a> 强力驱动, 版本 %s (%s)', $options->software, $prefixVersion, $suffixVersion); ?></p>
     </div>
     <nav class="resource">
         <a href="http://docs.typecho.org"><?php _e('帮助文档'); ?></a> &bull;
diff --git a/admin/css/style.css b/admin/css/style.css
index 16ed5a91..99597d27 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -140,7 +140,7 @@ button {
     transition-duration: 0.4s;
     background-color: #dbdbd6; }
   button:active, button.active {
-    background-color: #dbdbd6; }
+    background-color: #d6d6d0; }
   button:disabled {
     background-color: #f7f7f6;
     cursor: default; }
@@ -176,7 +176,7 @@ button {
     transition-duration: 0.4s;
     background-color: #3c6a81; }
   .primary:active, .primary.active {
-    background-color: #3c6a81; }
+    background-color: #39647a; }
   .primary:disabled {
     background-color: #508cab;
     cursor: default; }
@@ -201,7 +201,7 @@ button {
     transition-duration: 0.4s;
     background-color: #a4403f; }
   .btn-warn:active, .btn-warn.active {
-    background-color: #a4403f; }
+    background-color: #9c3e3c; }
   .btn-warn:disabled {
     background-color: #c1605e;
     cursor: default; }
@@ -420,17 +420,17 @@ button {
 * 注脚
 */
 .typecho-foot {
-  padding: 4em 0;
+  padding: 4em 0 3em;
   color: #999;
   line-height: 1.8;
   text-align: center; }
-
-.typecho-foot .resource {
-  color: #CCC; }
-
-.typecho-foot .resource a {
-  margin: 0 3px;
-  color: #999; }
+  .typecho-foot .copyright p {
+    margin: 10px 0 0; }
+  .typecho-foot .resource {
+    color: #CCC; }
+  .typecho-foot .resource a {
+    margin: 0 3px;
+    color: #999; }
 
 /* 低版本浏览器升级提示 */
 .browsehappy {
@@ -577,6 +577,8 @@ button {
   width: 280px;
   height: 100%;
   text-align: center; }
+  .typecho-login h1 {
+    margin-bottom: 1em; }
 
 .typecho-login .more-link {
   margin-top: 2em;
@@ -939,10 +941,13 @@ a.operate-reply {
     #custom-field .description button {
       float: left; }
   #custom-field .typecho-label {
-    margin: 0;
-    cursor: pointer; }
-    #custom-field .typecho-label:hover {
-      color: #467B96; }
+    margin: 0; }
+    #custom-field .typecho-label a {
+      display: block;
+      color: #444; }
+      #custom-field .typecho-label a:hover {
+        color: #467B96;
+        text-decoration: none; }
   #custom-field table {
     margin-top: 10px; }
   #custom-field td {
@@ -1165,6 +1170,33 @@ a.operate-reply {
 .mime-unknow {
   background-position: 0 -160px; }
 
+/* Logo 图标 */
+.i-logo, .i-logo-s {
+  width: 169px;
+  height: 40px;
+  display: inline-block;
+  background: url("../img/typecho-logo.svg") no-repeat;
+  text-indent: -9999em;
+  -webkit-background-size: auto 40px;
+  -moz-background-size: auto 40px;
+  -o-background-size: auto 40px;
+  background-size: auto 40px;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=30);
+  opacity: 0.3; }
+  .i-logo:hover, .i-logo-s:hover {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20);
+    opacity: 0.2; }
+
+.i-logo-s {
+  width: 26px;
+  height: 26px;
+  -webkit-background-size: auto 26px;
+  -moz-background-size: auto 26px;
+  -o-background-size: auto 26px;
+  background-size: auto 26px;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=10);
+  opacity: 0.1; }
+
 /*
 * Editor
 */
diff --git a/admin/custom-fields-js.php b/admin/custom-fields-js.php
index fe388507..b6dce8fd 100644
--- a/admin/custom-fields-js.php
+++ b/admin/custom-fields-js.php
@@ -9,6 +9,7 @@ $(document).ready(function () {
             btn.removeClass('i-caret-down').addClass('i-caret-right');
         }
         $(this).parent().toggleClass('fold');
+        return false;
     });
 
     function attachDeleteEvent (el) {
diff --git a/admin/custom-fields.php b/admin/custom-fields.php
index 5bc24153..ffdf8296 100644
--- a/admin/custom-fields.php
+++ b/admin/custom-fields.php
@@ -4,7 +4,7 @@ $fields = isset($post) ? $post->getFieldItems() : $page->getFieldItems();
 $defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaultFieldItems();
 ?>
                     <section id="custom-field" class="typecho-post-option<?php if (empty($defaultFields) && empty($fields)): ?> fold<?php endif; ?>">
-                        <label id="custom-field-expand" class="typecho-label" tabindex="0" role="button"><i class="i-caret-right"></i> <?php _e('自定义字段'); ?></label>
+                        <label id="custom-field-expand" class="typecho-label"><a href="##"><i class="i-caret-right"></i> <?php _e('自定义字段'); ?></a></label>
                         <table class="typecho-list-table mono">
                             <colgroup>
                                 <col width="25%"/>
diff --git a/admin/img/typecho-logo.svg b/admin/img/typecho-logo.svg
new file mode 100644
index 00000000..b447bb51
--- /dev/null
+++ b/admin/img/typecho-logo.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="110px" height="26px" viewBox="0 0 110 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>typecho-logo</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M34.75,5.288 C34.288,6.542 33.76,7.73 32.22,7.862 L32,9.468 L33.562,9.468 L33.562,15.342 C33.562,16.882 33.54,18.994 36.972,18.994 C38.006,18.994 39.106,18.686 39.766,18.224 L39.106,16.53 C38.754,16.75 38.204,16.992 37.61,16.992 C36.708,16.992 36.18,16.596 36.18,15.254 L36.18,9.468 L38.886,9.468 L39.106,7.62 L36.18,7.62 L36.18,5.288 L34.75,5.288 Z M48.258,18.268 C48.258,20.27 47.444,21.502 45.42,21.502 C44.76,21.502 44.276,21.436 43.858,21.282 C43.462,21.128 43.352,20.908 43.352,20.49 L43.352,19.434 L41.262,19.61 L41.262,22.668 C42.186,23.13 44.012,23.394 45.398,23.394 C48.676,23.394 50.502,21.898 50.502,18.268 L50.502,7.62 L46.63,7.62 L46.63,9.424 L47.334,9.468 C47.752,9.468 47.884,9.644 47.884,10.128 L47.884,14.11 C47.884,15.254 47.07,16.288 45.53,16.288 C44.122,16.288 43.902,15.276 43.902,13.934 L43.902,7.62 L40.03,7.62 L40.03,9.424 L40.734,9.468 C41.108,9.49 41.284,9.622 41.284,10.084 L41.284,14.506 C41.284,17.102 42.494,18.312 44.694,18.312 C46.146,18.312 47.488,17.696 48.258,16.596 L48.258,18.268 Z M54,20.776 C54,21.326 53.78,21.458 53.362,21.502 L52.636,21.568 L52.636,23.24 L58.312,23.24 L58.312,21.502 L56.53,21.414 L56.53,18.378 C57.102,18.73 58.026,19.016 58.884,19.016 C61.788,19.016 63.702,16.926 63.702,12.878 C63.702,8.94 62.162,7.29 59.72,7.29 C57.85,7.29 56.64,8.302 56.244,9.05 L56.244,7.62 L52.526,7.62 L52.526,9.402 L53.45,9.468 C53.868,9.468 54,9.644 54,10.128 L54,20.776 Z M60.974,13.098 C60.974,15.012 60.336,16.926 58.466,16.926 C57.894,16.926 57.102,16.75 56.53,16.376 L56.53,11.316 C56.53,10.304 57.498,9.424 58.752,9.424 C59.918,9.424 60.974,10.172 60.974,13.098 Z M70.786,7.29 C67.178,7.29 65.352,10.15 65.352,13.406 C65.352,16.684 66.804,18.972 70.544,18.972 C72.612,18.972 74.064,18.048 74.416,17.74 L73.58,15.958 C73.052,16.332 72.106,16.926 70.808,16.926 C68.938,16.926 68.19,15.76 68.102,14.33 C70.698,14.308 74.372,13.736 74.372,10.348 C74.372,8.39 72.942,7.29 70.786,7.29 Z M71.952,10.392 C71.952,12.086 69.642,12.46 68.014,12.482 C68.08,10.854 68.872,9.16 70.632,9.16 C71.424,9.16 71.952,9.578 71.952,10.392 Z M81.192,16.97 C79.234,16.97 78.354,15.43 78.354,13.032 C78.354,10.59 79.256,9.27 81.016,9.27 C81.346,9.27 81.61,9.314 81.874,9.402 C82.27,9.534 82.336,9.732 82.336,10.15 L82.336,11.206 L84.36,11.052 L84.36,8.192 C83.304,7.62 82.248,7.29 80.928,7.29 C78.442,7.29 75.692,8.83 75.692,13.296 C75.692,16.948 77.606,18.994 80.84,18.994 C82.468,18.994 83.81,18.422 84.668,17.718 L83.722,16.024 C82.82,16.684 82.05,16.97 81.192,16.97 Z M87.286,16.222 C87.286,16.772 87.066,16.904 86.648,16.948 L85.922,17.014 L85.922,18.686 L91.158,18.686 L91.158,16.926 L89.904,16.86 L89.904,11.536 C89.904,10.392 90.718,9.314 92.258,9.314 C93.666,9.314 93.974,10.348 93.974,11.69 L93.974,16.222 C93.974,16.772 93.754,16.904 93.336,16.948 L92.61,17.014 L92.61,18.686 L97.846,18.686 L97.846,16.926 L96.592,16.86 L96.592,11.118 C96.592,8.522 95.294,7.29 93.094,7.29 C91.642,7.29 90.542,7.972 89.882,8.918 L89.882,3 L85.966,3 L85.966,4.826 L86.736,4.87 C87.154,4.892 87.286,5.024 87.286,5.508 L87.286,16.222 Z M98.924,13.142 C98.924,17.124 100.86,19.016 103.808,19.016 C106.712,19.016 109.066,17.08 109.066,12.856 C109.066,7.796 105.788,7.29 104.16,7.29 C101.894,7.29 98.924,8.566 98.924,13.142 Z M103.984,17.08 C101.872,17.08 101.586,14.88 101.586,12.834 C101.586,10.722 102.29,9.226 104.028,9.226 C105.788,9.226 106.382,10.744 106.382,13.208 C106.382,15.496 105.7,17.08 103.984,17.08 Z" id="typecho" fill="#000000" sketch:type="MSShapeGroup"></path>
+        <path d="M13,26 C3.36833333,26 0,22.631 0,13 C0,3.36866667 3.36833333,0 13,0 C22.6316667,0 26,3.36866667 26,13 C26,22.631 22.6316667,26 13,26 Z M6,9 L20,9 L20,7 L6,7 L6,9 Z M6,14 L16,14 L16,12 L6,12 L6,14 Z M6,19 L18,19 L18,17 L6,17 L6,19 Z" id="icon" fill="#000000" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/admin/login.php b/admin/login.php
index 9ca14c5c..a884a7af 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -11,7 +11,7 @@ include 'header.php';
 ?>
 
 <div class="typecho-login">
-    <h1>Typecho</h1>
+    <h1><a href="http://typecho.org" class="i-logo">Typecho</a></h1>
     <form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form">
         <p>
             <label for="name" class="visuallyhidden"><?php _e('用户名'); ?></label>
diff --git a/admin/register.php b/admin/register.php
index d33597e2..55e134f6 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -13,7 +13,7 @@ include 'header.php';
 ?>
 
 <div class="typecho-login">
-    <h1>Typecho</h1>
+    <h1><a href="http://typecho.org" class="i-logo">Typecho</a></h1>
     <form action="<?php $options->registerAction(); ?>" method="post" name="register" role="form">
         <p>
             <label for="name" class="visuallyhidden"><?php _e('用户名'); ?></label>
diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss
index e87d6f76..64dd2eb8 100644
--- a/admin/scss/_buttons.scss
+++ b/admin/scss/_buttons.scss
@@ -17,7 +17,7 @@
     background-color: darken($color, 6%);
   }
   &:active, &.active {
-    background-color: darken($color, 6%);
+    background-color: darken($color, 8%);
   }
   &:disabled {
     background-color: lighten($color, 6%);
diff --git a/admin/scss/_footer.scss b/admin/scss/_footer.scss
index c2144c4e..9e31a9ab 100644
--- a/admin/scss/_footer.scss
+++ b/admin/scss/_footer.scss
@@ -2,17 +2,19 @@
 * 注脚
 */
 .typecho-foot {
-  padding: 4em 0;
+  padding: 4em 0 3em;
   color: #999;
   line-height: 1.8;
   text-align: center;
-}
 
-.typecho-foot .resource {
-  color: #CCC;
+  .copyright p {
+    margin: 10px 0 0;
+  }
+  .resource {
+    color: #CCC;
+  }
+  .resource a {
+    margin: 0 3px;
+    color: #999;
+  }
 }
-
-.typecho-foot .resource a {
-  margin: 0 3px;
-  color: #999;
-}
\ No newline at end of file
diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss
index 79d5c5c2..1d146fe5 100644
--- a/admin/scss/_icons.scss
+++ b/admin/scss/_icons.scss
@@ -108,4 +108,26 @@ $icons-2x: sprite-map("icons-2x/*.png");
 .mime-unknow {
   @extend %i-16;
   background-position: sprite-position($icons, mime-unknow);
-}
\ No newline at end of file
+}
+
+
+/* Logo 图标 */
+.i-logo, .i-logo-s {
+  width: 169px;
+  height: 40px;
+  display: inline-block;
+  background: url("../img/typecho-logo.svg") no-repeat;
+  text-indent: -9999em;
+  @include background-size(auto 40px);
+  @include opacity(.3);
+  &:hover {
+    @include opacity(.2);
+  }
+}
+.i-logo-s {
+  width: 26px;
+  height: 26px;
+  @include background-size(auto 26px);
+  @include opacity(.1);
+}
+
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index 02505bc0..421b1827 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -252,6 +252,9 @@ a.button:hover, a.balloon-button:hover {
   width: 280px;
   height: 100%;
   text-align: center;
+  h1 {
+    margin-bottom: 1em; 
+  }
 }
 
 .typecho-login .more-link {
@@ -698,9 +701,13 @@ a.operate-reply {
 
   .typecho-label {
     margin: 0;
-    cursor: pointer;
-    &:hover {
-      color: #467B96;
+    a {
+      display: block;
+      color: #444;
+      &:hover {
+        color: #467B96;
+        text-decoration: none;
+      }
     }
   }
   table {
diff --git a/usr/themes/default/comments.php b/usr/themes/default/comments.php
index 910aac79..fd6e66e6 100644
--- a/usr/themes/default/comments.php
+++ b/usr/themes/default/comments.php
@@ -30,7 +30,7 @@
     		</p>
     		<p>
                 <label for="url"<?php if ($this->options->commentsRequireURL): ?> class="required"<?php endif; ?>><?php _e('网站'); ?></label>
-    			<input type="url" name="url" id="url" class="text" placeholder="<?php _e('http://example.com'); ?>" value="<?php $this->remember('url'); ?>"<?php if ($this->options->commentsRequireURL): ?> required<?php endif; ?> />
+    			<input type="url" name="url" id="url" class="text" placeholder="<?php _e('http://'); ?>" value="<?php $this->remember('url'); ?>"<?php if ($this->options->commentsRequireURL): ?> required<?php endif; ?> />
     		</p>
             <?php endif; ?>
     		<p>