From 51d31fe7cdf313f010e0c09e9bcbf4fc21175e60 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Mon, 2 Dec 2013 18:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95=E5=9C=A8=20IE=201?=
 =?UTF-8?q?0=20=E4=B8=8B=E6=97=A0=E6=B3=95=E8=B4=9F=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css          | 4 ++++
 admin/profile.php            | 2 +-
 admin/scss/_buttons.scss     | 1 +
 admin/scss/style.scss        | 5 +++++
 usr/themes/default/style.css | 3 ++-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index f2ffbfc9..bda5405b 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -503,6 +503,10 @@ button {
 .front-archive {
   padding-left: 1.5em; }
 
+.profile-avatar {
+  border: 1px dashed #D9D9D6;
+  max-width: 100%; }
+
 /** 增加配置面板内部的错误样式 by 70 */
 /** 
 * 安装样式
diff --git a/admin/profile.php b/admin/profile.php
index 35dbef18..153205a0 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -11,7 +11,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
         <?php include 'page-title.php'; ?>
         <div class="colgroup typecho-page-main">
             <div class="col-mb-12 col-tb-3">
-                <p><a href="http://gravatar.com/emails/" title="<?php _e('在 Gravatar 上修改头像'); ?>"><?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=220&r=X' .
+                <p><a href="http://gravatar.com/emails/" title="<?php _e('在 Gravatar 上修改头像'); ?>"><?php echo '<img class="profile-avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=220&r=X' .
                 '&d=" alt="' . $user->screenName . '" />'; ?></a></p>
                 <h2><?php $user->screenName(); ?><br><small><?php $user->name(); ?></small></h2>
                 <p><?php _e('目前有 <em>%s</em> 篇 Blog,并有 <em>%s</em> 条关于你的评论在已设定的 <em>%s</em> 个分类中.', 
diff --git a/admin/scss/_buttons.scss b/admin/scss/_buttons.scss
index 76b50d1c..fb489e47 100644
--- a/admin/scss/_buttons.scss
+++ b/admin/scss/_buttons.scss
@@ -10,6 +10,7 @@
   cursor: pointer;
 
   @include border-radius(2px);
+  // @include transition-property(background-color);
   @include transition-duration(.4s);
 
   &:hover {
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index 69226433..0073099d 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -166,6 +166,11 @@ a.button:hover, a.balloon-button:hover {
   padding-left: 1.5em;
 }
 
+.profile-avatar {
+  border: 1px dashed #D9D9D6;
+  max-width: 100%;
+}
+
 /** 增加配置面板内部的错误样式 by 70 */
 
 
diff --git a/usr/themes/default/style.css b/usr/themes/default/style.css
index afa66016..005e00a0 100644
--- a/usr/themes/default/style.css
+++ b/usr/themes/default/style.css
@@ -106,7 +106,7 @@ textarea {
 
 /* Navigation menu */
 #nav-menu {
-  margin: 25px 0 -1px;
+  margin: 25px 0 0;
   padding: 0;
 }
 #nav-menu a {
@@ -114,6 +114,7 @@ textarea {
   margin-right: -1px;
   padding: 0 20px;
   border: 1px solid #EEE;
+  border-bottom: none;
   height: 32px;
   line-height: 32px;
   color: #444;