From 990df82d80979698bde753f3fa92f16f72015e95 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Fri, 18 Oct 2013 22:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css                    |  58 ++++++++++++++-----------
 admin/images/editor.png                | Bin 0 -> 6663 bytes
 admin/images/editor/editor-bold.png    | Bin 0 -> 433 bytes
 admin/images/editor/editor-code.png    | Bin 0 -> 384 bytes
 admin/images/editor/editor-heading.png | Bin 0 -> 181 bytes
 admin/images/editor/editor-hr.png      | Bin 0 -> 153 bytes
 admin/images/editor/editor-image.png   | Bin 0 -> 316 bytes
 admin/images/editor/editor-italic.png  | Bin 0 -> 310 bytes
 admin/images/editor/editor-link.png    | Bin 0 -> 262 bytes
 admin/images/editor/editor-olist.png   | Bin 0 -> 209 bytes
 admin/images/editor/editor-quote.png   | Bin 0 -> 473 bytes
 admin/images/editor/editor-redo.png    | Bin 0 -> 254 bytes
 admin/images/editor/editor-ulist.png   | Bin 0 -> 171 bytes
 admin/images/editor/editor-undo.png    | Bin 0 -> 259 bytes
 admin/manage-medias.php                |   2 +-
 admin/manage-metas.php                 |   2 +-
 admin/manage-pages.php                 |   2 +-
 admin/manage-posts.php                 |   2 +-
 admin/manage-users.php                 |   2 +-
 admin/scss/_icons.scss                 |   8 +++-
 admin/scss/components/_editor.scss     |  47 +++++++++++++-------
 admin/scss/style.scss                  |   2 +-
 admin/write-js.php                     |   2 +-
 23 files changed, 78 insertions(+), 49 deletions(-)
 create mode 100644 admin/images/editor.png
 create mode 100644 admin/images/editor/editor-bold.png
 create mode 100644 admin/images/editor/editor-code.png
 create mode 100644 admin/images/editor/editor-heading.png
 create mode 100644 admin/images/editor/editor-hr.png
 create mode 100644 admin/images/editor/editor-image.png
 create mode 100644 admin/images/editor/editor-italic.png
 create mode 100644 admin/images/editor/editor-link.png
 create mode 100644 admin/images/editor/editor-olist.png
 create mode 100644 admin/images/editor/editor-quote.png
 create mode 100644 admin/images/editor/editor-redo.png
 create mode 100644 admin/images/editor/editor-ulist.png
 create mode 100644 admin/images/editor/editor-undo.png

diff --git a/admin/css/style.css b/admin/css/style.css
index a4151395..8036565e 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -440,6 +440,9 @@ button {
   content: " *";
   color: #B94A48; }
 
+.typecho-option span {
+  margin-right: 15px; }
+
 .typecho-option .description {
   margin: .5em 0 0;
   color: #999;
@@ -970,13 +973,18 @@ a.operate-reply {
 /**
  * icons
  */
+.icon-sprite-hack {
+  background: url('../images/icons-s2ae04ce87c.png'); }
+
 .i-edit, .i-delete, .i-caret-up, .i-caret-down, .i-exlink {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: url('../images/icons-s2ae04ce87c.png');
   background: url(../images/icons.png) no-repeat; }
+  .i-edit:hover, .i-delete:hover, .i-caret-up:hover, .i-caret-down:hover, .i-exlink:hover {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75);
+    opacity: 0.75; }
 
 .i-edit {
   background-position: 0 -32px; }
@@ -1034,32 +1042,32 @@ a.operate-reply {
 * Editor
 */
 .editor {
-  margin-bottom: -0.5em;
-  font-size: .92857em; }
+  margin-bottom: -1em; }
+
+.wmd-button-row {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+  .wmd-button-row li {
+    display: inline-block;
+    margin-right: 4px;
+    padding: 3px;
+    cursor: pointer; }
+    .wmd-button-row li:hover {
+      background-color: #E9E9E6; }
+    .wmd-button-row li.wmd-spacer {
+      height: 20px;
+      margin: 0 10px 0 6px;
+      padding: 3px 0;
+      width: 1px;
+      background: #E9E9E6;
+      cursor: default; }
 
 .editor span {
-  display: inline-block;
-  padding: 0 12px;
-  height: 25px;
-  line-height: 25px;
-  cursor: pointer; }
-  .editor span:hover {
-    background-color: #E9E9E6; }
-  .editor span:active {
-    background-color: #467B96;
-    color: #FFF; }
-
-.btnBold {
-  font-weight: bold; }
-
-.btnItalic {
-  font-style: italic; }
-
-.btnLink {
-  text-decoration: underline; }
-
-.btnDel {
-  text-decoration: line-through; }
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: transparent url(../images/editor.png) no-repeat; }
 
 /**
 * Jquery Timepicker
diff --git a/admin/images/editor.png b/admin/images/editor.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b6b7d436a786991df613d9662c5a4dda4aaa0c4
GIT binary patch
literal 6663
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
U=ES%AA3T5;Y9Q5W6^oGn0jeD^egFUf

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-bold.png b/admin/images/editor/editor-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ce0d4b8e8d16f8c8074dad6f99a4977ccb4f307
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004aNkl<ZI1$Z~
zyGz4R6vms!U=SgqAk{_CMR0PeyOSU;f*r&$B*BnTaEoIQA#}*YL7e;>bWsq|y_1`W
zf{#TJ9HL45t|oArq|``<Ubvj^yngqd+;B;f)cU#je!>`Q@PT4}WXEwPBuP5Nw;g3U
zj^mzTKA8`F8%5E9rfJvtzRWL-Y?|g1lB;O`!frrsD~hrfhG7%Xd7kGlT-RO70C`&g
zvH}3ujc#bMVHhv)TR21%1Yv{bs4fN40;&OvnUBL>X`Jdm11-xE0op|KJ;vXo5ULB0
zLX)Z9@qIt6*Xs=cFA-bE_-`e3KcSvC1mp;#?#6Mvg^pSHXF(7w{2K_^10Ly4Rn>Fo
z73@hsPi@;CDTDUBA#DQq1AZIOF<F)uX)e>1fN9edv-rUuGYGX^fw;wRS~!z6c%IjU
zp2Nr|x~{jgIJF#-)UTmw8n70E%dqUgckC<F4Z)6MA0xh>jt{qU6@Z=T>R#88tD}B9
b1|RqhEuVdKT^~ke00000NkvXXu0mjf((AtT

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-code.png b/admin/images/editor/editor-code.png
new file mode 100644
index 0000000000000000000000000000000000000000..c49bd79fd1886970b3edade6a079c76894c8d2b1
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0003;Nkl<ZI1yv~
z|NlP&H31Vf4Fj1qY9Qqy%7V>^DO08>vazwP`}gnPqL(jUPOY!6{{>Rl*x1M+DJhu?
zWJUmSU|L$*Bak>Uz=#y6VF!SU449ahf<#3{*<c!ghOq<L!9Z*T#0O^0nk5I5gV87k
zA{ho!c;wHYKb~1xSzlm^fiC(8WV-|LNg!4PVhls!1`;w1s2L0h845QL7-sW<I^=*k
z=O-}iB9L7MH49FG3<aqH3j79QMWCKpFiE(9K!G?QzR$?W$PNs<wZQP<hbcm*r%#_Q
z2vP$SX9XH|`}gnPNia2V1EDeI0F<~7#O6S}6PuwR!<d<w_W<RMpoTf*<m5a9^1%RZ
zAc#lEP(p@*%s?>^&Cqkea9a2L`SYJ3aS-?c1VCyn&}C<U-b8U3SOJh=1WLl#RG~3k
eNU5nK&_Dp|mzqrT-gUnK0000<MNUMnLSTaG_nGkk

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-heading.png b/admin/images/editor/editor-heading.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb0a3c428d26be0c10003139d78b8b4f583fa784
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;Aji-xah=t(O$=+NC6nI=_U)o%y
zp+9@l(dNLIkl9TEj%vpY?CPJrb5FB2K6~hO^x>%0my@@4Tnw~(_UoF!v>+X>fG)|!
zPuy=w^l_yXpKhyS*|p;D`<pSl>gRPnn|Gw@_sjGjT>&R=oQ!J;(0nP^;>Dsm%Wub@
g>58vR?|xw0dBy2@ww3-KpgR~mUHx3vIVCg!0HP^MUjP6A

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-hr.png b/admin/images/editor/editor-hr.png
new file mode 100644
index 0000000000000000000000000000000000000000..b764ded28c5dc4e174cba95d5b5474fa0157f160
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;Af~SjPh=pMCpa1{unN1mmO?jDT
zn!51LG0he`*l=`d+K1|ytl>J3KMCo5H7Go`a4MhUy_U+UA>S^1G`beiRw@0AH>M;i
zN=kW`Oc=9c*9J|uYdxng9h@KB7IDapucYWEgRHDY$B~x(FMxJ2c)I$ztaD0e0sx&;
BHBtZo

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-image.png b/admin/images/editor/editor-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..58208e9dee297ebafdcd2989d88c8ba75feabc03
GIT binary patch
literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00034Nkl<ZI1$xT
zu?oU45H%r4?Ju~9gR8UP7gRU@p>!3YxVbsF1cy@EQGdbyf#22oPH1|T6eDz~2jSkO
z?_P3usi>-I)ThZl#Yk)Tf{K@%=lKKihVMDxA`HW=;n7g)m1P-V6T9Gc&Y$(r^uYqq
z-!)or5kkc1+0#OKZ#k8$wVpui4zU$^in|0qrp!sW(E-W(vMdAN_jeGR(RcEQkANqN
z+h)CCk|YZd&q$t1DR1yGPoy|a(>dR(u~kqhr9l`I3CT-1k1#V22VGfgptWR_8ekbx
z2WTEMBUlBaC=!hG6Ko3>7{=GD@e@!9{jSD@LurQW0<1%EN$lbbU+@LoxO%Xe0?`ow
O0000<MNUMnLSTY<%7|b9

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-italic.png b/admin/images/editor/editor-italic.png
new file mode 100644
index 0000000000000000000000000000000000000000..707aca317f11a161175be8a9e6b8f2dae09a2d30
GIT binary patch
literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0002}Nkl<ZI1$Z~
zp$@_@5QZtKLeC)4JOT*<k09^>sAXab9$-%~v1!y$1U&_4cmrgYpg>?282^#gt=Ec)
zooRFT-`D$Z6IE69+KhgiFk*EdC~cOLB-scdme{p+^T2%<1VPr+D_lMbpesQ4&>r(V
zUu0SKX@XHsziO)MyjNeqGQ&vY3Y?I*EXxa>TsQ$?mw+k^!#f9~niZI)=@7aR_Gg{W
z2?)^NF2rYQu!VI(05q_j3G4m6i=w#MrlUIhA7Xz4SbhR}@_m2i0%R=%HU&)Lyt=@Q
z6UK2omQrp3n?vLQ_`?05lv+no^yT2JWv<awV=bGSxP144KiS4znS5IcBme*a07*qo
IM6N<$g7+PPkN^Mx

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-link.png b/admin/images/editor/editor-link.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f7853f679fcbc2cf57e322d769f278077ac0f4
GIT binary patch
literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0002ZNkl<ZI1%NO
z+YQ4Y3`GO!7*Pjm_aJ2?*dy&gWer5HE6l5rQk49~QiQS1foq5eAq+>FJQ7B%69O+=
zJv7GLgb)UG(@L%L-Yc#3i*uVmg5f31uqQ9#(OP?#QqpEujt%r|_Iyx)<(W~PuvcC>
zRpC^?Zg~ZW-3o}{)b<K}dL#Z&N-Y?3uP}*<9Nc6rFeTWbTO7v`T>Ep&P~_0RnQOme
z+0eGZW$s_U{q-C@g=)t*A$d{$S~|rl$=&i2COd+p9BHlO-Ru(rKcG{`9lvU7O#lD@
M07*qoM6N<$f+LM>Qvd(}

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-olist.png b/admin/images/editor/editor-olist.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a5b88eae73a9dfd1e1fa2ad7591b7abf9aa902e
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE<r3{Mxw5DUSlK^OTN6gbXY+y2Y{
z*JhQx9GR>qTbAGQv3$tV=iqYu-1|G8$71daJ)6^c-Rs(PzCOb?xkUcWg-Of{8_J%y
z>zHj?*gmQA&Ef^>HgDvlH6qi^f|s3>;AnLb-n@CMDdT+Ab&p~;#c3{0QZh^aA21~?
zCxRiP=;fD58afBM3=GWT)Jk>c#0PJB{66mRjUD&&Wwr_5OFgrjSMcUGSD+giJYD@<
J);T3K0RZ}tQvLt{

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-quote.png b/admin/images/editor/editor-quote.png
new file mode 100644
index 0000000000000000000000000000000000000000..a58049467496a3e75762c1402f7e5d8c320a492a
GIT binary patch
literal 473
zcmV;~0Ve*5P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004?Nkl<ZI1yv~
z|NlP&H31Vf4Fj1qY9MNeGBPl*Ffd${MipgXxXHl4%fN7!3tb$<XT%lDiyt$XeAzzh
zG&93*hP1RCU|2(v!{Wma624#GHJ_FF<%h)NT0wL}fiA!VQ%}DOV?DoSB{RcchBOCx
zTbN<JYj!W=eRn^Sf#DlNVzRXkrcSVzP=)&$7^Jy@hB1I$Cd<db;PV-zqW|>AFpy!~
ztY02PCl)KgEJ4+cCE0viv}!9zQCjFbJq89puwfwnzw;}>mH-V?#bp>s9Y#9j`0+s>
zB(Y<!T;-M1JHvp%%$UW%AP9^FAYf%Uv~6R}tLqzGz+5Z@ih;mbWn_jbdi3sR<gxP)
zR~}o}IwPNf;SWsjjVCYaHynPso8er)FH8)XMlleWtN(vx<$i#y;Qq(|Zt4sSpT8js
z0@;^d{4_=r0&`Ie1c|Uq8%;x2sL0Q_3&j7*A#f2{Tu+hX2r?hW#+nXS-+FJu|KPNx
zl;F>YI;Os>V2U@Nz7od%{+Ya~!ms0kYCgmp2s3~j8pF%v7=o;41R4kcHYbg@-gbv~
P00000NkvXXu0mjfhC<FH

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-redo.png b/admin/images/editor/editor-redo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b22468d7b397c01424dc62bf9d9acda644efc218
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE<rQBN1g5DUTNKmY&RGn+CBoANTx
zG(E#J$Flg@CQe~BjtAUollGiBaYEwc$&;0t*VaV#?ch;8=`caj!8x_@O5B2lwv*NU
z)7;Hxu*Nd1m@uQ{2*;K1GsljpF)m4-aQ1+KfXd8i)7UOGFiy~6j=c5#_4V~xC9V;?
zF5xX_*wb2$JLDf{*1g-W!<Rf+q|M>*wEF-5V)>^hCOA7r@=G#LW}DEh<;FE%Mf}j7
z*8XL?8Y7fhHO&lVnzdOEh!`~;YM<5cDo(DEjftU9F84x?d$tkKLkym-elF{r5}E*l
Cc3gn~

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-ulist.png b/admin/images/editor/editor-ulist.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7948be5bbc34464742a61006d482366ba6a6c03
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;Ak*AAeh=pMCpa1{unN1mmO?jDT
zx|T9WPKdQgKGqZF=61{`!NBL#i4!Z_rYTSBO;R{vpzw?_>l|~^hQ`flXAeoA$jr>_
zIWcXa1V@qN2?Gt@u=aI~k;Z0bj~Dc(is<*dac%QZ(J-48?B?XRuu3QRt^<Q>f!|`O
TuoVY^wljFT`njxgN@xNAye2ox

literal 0
HcmV?d00001

diff --git a/admin/images/editor/editor-undo.png b/admin/images/editor/editor-undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..75925fc89111f49acd76c5ef899e7d0d9da90678
GIT binary patch
literal 259
zcmV+e0sQ`nP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0002WNkl<ZI1yv~
z|NlP&H31Vf4Fj1q#0{J<VS>QSnKPG>5-d2qJZsi0M@~-8ON@++k)#;Ng06V-<jL$n
z&<YeU0vg7ME>DQhh@NbKUR(k+Cz_B(n0#7V8j7VDF8uZDS2ECrFMt|~fEcV8T@%bO
zV6b2$VvI1%&CUG@G@t~i$r<SS$1u&r(ijH9Gy)CX|NZ-SJ)oh>VPZtlpfDsC1H&7r
z6;(e@7ZT+fEQ+XZAVw^sTZ%0v(bXXHG14KjBspxVdwB#J2mqKVZ%WY;T}J=_002ov
JPDHLkV1jm}VeS9`

literal 0
HcmV?d00001

diff --git a/admin/manage-medias.php b/admin/manage-medias.php
index acc63e55..36bd7674 100644
--- a/admin/manage-medias.php
+++ b/admin/manage-medias.php
@@ -63,7 +63,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                                 <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $attachments->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($attachments->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $attachments->commentsNum(); ?></a></td>
                                 <td>
                                 <a class="typecho-mime typecho-mime-<?php echo $mime; ?>" href="<?php $options->adminUrl('media.php?cid=' . $attachments->cid); ?>"><?php $attachments->title(); ?></a>
-                                <a class="right" href="<?php $attachments->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $attachments->title); ?>"></i></a>
+                                <a href="<?php $attachments->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $attachments->title); ?>"></i></a>
                                 </td>
                                 <td><?php $attachments->author(); ?></td>
                                 <td>
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index 83631078..423e35e7 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -60,7 +60,7 @@ include 'menu.php';
                                 <tr id="mid-<?php $categories->theId(); ?>">
                                     <td><input type="checkbox" value="<?php $categories->mid(); ?>" name="mid[]"/></td>
                                     <td><a href="<?php echo $request->makeUriByRequest('mid=' . $categories->mid); ?>"><?php $categories->name(); ?></a>
-                                    <a class="right" href="<?php $categories->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $categories->name); ?>"></i></a>
+                                    <a href="<?php $categories->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $categories->name); ?>"></i></a>
                                     </td>
                                     <td><?php $categories->slug(); ?></td>
                                     <td>
diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index 6c025614..3d8989b4 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -73,7 +73,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                                 }
                                 ?>
                                 <?php if ('page_draft' != $pages->type): ?>
-                                <a class="right" href="<?php $pages->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($pages->title)); ?>"></i></a>
+                                <a href="<?php $pages->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($pages->title)); ?>"></i></a>
                                 <?php endif; ?>
                                 </td>
                                 <td><?php $pages->slug(); ?></td>
diff --git a/admin/manage-posts.php b/admin/manage-posts.php
index e43ff199..ade73e7a 100644
--- a/admin/manage-posts.php
+++ b/admin/manage-posts.php
@@ -82,7 +82,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                             }
                             ?>
                             <?php if ('post_draft' != $posts->type): ?>
-                            <a class="right" href="<?php $posts->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>" /></i></a>
+                            <a href="<?php $posts->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>" /></i></a>
                             <?php endif; ?>
                             </td>
                             <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $posts->author->uid); ?>"><?php $posts->author(); ?></a></td>
diff --git a/admin/manage-users.php b/admin/manage-users.php
index 39d149c9..1b65f148 100644
--- a/admin/manage-users.php
+++ b/admin/manage-users.php
@@ -56,7 +56,7 @@ include 'menu.php';
                                 <td><input type="checkbox" value="<?php $users->uid(); ?>" name="uid[]"/></td>
                                 <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $users->uid); ?>" class="balloon-button left size-<?php echo Typecho_Common::splitByCount($users->postsNum, 1, 10, 20, 50, 100); ?>"><?php $users->postsNum(); ?></a></td>
                                 <td><a href="<?php $options->adminUrl('user.php?uid=' . $users->uid); ?>"><?php $users->name(); ?></a>
-                                <a class="right" href="<?php $users->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $users->screenName); ?>"></i></a>
+                                <a href="<?php $users->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $users->screenName); ?>"></i></a>
                                 </td>
                                 <td><?php $users->screenName(); ?></td>
                                 <td><?php if($users->mail): ?><a href="mailto:<?php $users->mail(); ?>"><?php $users->mail(); ?></a><?php else: _e('暂无'); endif; ?></td>
diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss
index 7cc82791..6ef67c9d 100644
--- a/admin/scss/_icons.scss
+++ b/admin/scss/_icons.scss
@@ -4,13 +4,19 @@
 
 $icons: sprite-map("icons/*.png");
 
+.icon-sprite-hack {
+  background: $icons;
+}
+
 %i-16 {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: $icons;
   background: url(../images/icons.png) no-repeat;
+  &:hover {
+    @include opacity(0.75);
+  }
 }
 
 .i-edit {
diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss
index 80c74a74..ff271bbf 100644
--- a/admin/scss/components/_editor.scss
+++ b/admin/scss/components/_editor.scss
@@ -2,21 +2,36 @@
 * Editor
 */
 .editor {
-  margin-bottom: -0.5em;
-  font-size: .92857em;
+  margin-bottom: -1em;
 }
+
+.wmd-button-row {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+
+  li {
+    display: inline-block;
+    margin-right: 4px;
+    padding: 3px;
+    cursor: pointer;
+    &:hover {
+      background-color: #E9E9E6;
+    }
+    &.wmd-spacer {
+      height: 20px;
+      margin: 0 10px 0 6px;
+      padding: 3px 0;
+      width: 1px;
+      background: #E9E9E6;
+      cursor: default;
+    }
+  }
+}
+
 .editor span {
-  display: inline-block;
-  padding: 0 12px;
-  height: 25px;
-  line-height: 25px;
-  cursor: pointer;
-
-  &:hover { background-color: #E9E9E6; }
-  &:active { background-color: #467B96; color: #FFF; }
-}
-
-.btnBold { font-weight: bold; }
-.btnItalic { font-style: italic; }
-.btnLink { text-decoration: underline; }
-.btnDel { text-decoration: line-through; }
\ No newline at end of file
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: transparent url(../images/editor.png) no-repeat;
+}
\ No newline at end of file
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index be2ebdce..21832bed 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -153,7 +153,7 @@ a.button:hover, a.balloon-button:hover {
 }
 .typecho-option label.typecho-label+input {
 }
-
+.typecho-option span { margin-right: 15px; }
 .typecho-option .description {
   margin: .5em 0 0;
   color: #999;
diff --git a/admin/write-js.php b/admin/write-js.php
index 9d1ef9ca..cb2880e5 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -160,7 +160,7 @@ $(document).ready(function() {
 <script src="<?php $options->adminUrl('js/markdown.js?v=' . $suffixVersion); ?>"></script>
 <script>
 $(document).ready(function () {
-    var toolbar = $('<p class="editor" id="wmd-button-bar" />').insertBefore($('#text').parent())
+    var toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore($('#text').parent())
         preview = $('<div id="wmd-preview" />').insertAfter('.submit');
 
     var converter = new Showdown.converter(), options = {};