From f7eddbaf79d761db32bc22199cae922ae371bde2 Mon Sep 17 00:00:00 2001 From: fen Date: Tue, 24 Dec 2013 16:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=95=99=E5=85=A8=E5=B1=8F=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - admin/css/style.css | 58 ++++++++++++++-------- admin/img/icons-2x/icon-arrow-down-2x.png | Bin 271 -> 0 bytes admin/img/icons-2x/icon-arrow-up-2x.png | Bin 250 -> 0 bytes admin/img/icons-2x/icon-upload-2x.png | Bin 0 -> 1089 bytes admin/img/icons-s2ebed63329.png | Bin 941 -> 0 bytes admin/img/icons-s93f9ba6074.png | Bin 0 -> 1283 bytes admin/img/icons/icon-caret-down.png | Bin 193 -> 0 bytes admin/img/icons/icon-caret-up.png | Bin 177 -> 0 bytes admin/img/icons/icon-upload.png | Bin 0 -> 557 bytes admin/scss/_buttons.scss | 7 +++ admin/scss/_icons.scss | 14 +++--- admin/scss/_mixin.scss | 5 -- admin/scss/components/_editor.scss | 18 +++++-- admin/scss/style.scss | 8 ++- admin/write-js.php | 7 +++ admin/write-post.php | 1 + 17 files changed, 80 insertions(+), 39 deletions(-) delete mode 100644 admin/img/icons-2x/icon-arrow-down-2x.png delete mode 100644 admin/img/icons-2x/icon-arrow-up-2x.png create mode 100644 admin/img/icons-2x/icon-upload-2x.png delete mode 100644 admin/img/icons-s2ebed63329.png create mode 100644 admin/img/icons-s93f9ba6074.png delete mode 100644 admin/img/icons/icon-caret-down.png delete mode 100644 admin/img/icons/icon-caret-up.png create mode 100644 admin/img/icons/icon-upload.png delete mode 100644 admin/scss/_mixin.scss diff --git a/.gitignore b/.gitignore index cd0f9ed8..73f184b8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ .*.swo ._* .DS_Store -/Debug/ /ImgCache/ /Backup_rar/ /Debug/ diff --git a/admin/css/style.css b/admin/css/style.css index 7e84092d..15a27499 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -209,6 +209,11 @@ button { background-color: #c1605e; cursor: default; } +.btn-text { + background: transparent; } + .btn-text:hover, .btn-text:active, .btn-text.active { + background: #F3F3F0; } + /* 下拉菜单 */ .btn-drop { position: relative; } @@ -1022,6 +1027,8 @@ a.operate-reply { list-style: none; border: 1px solid #D9D9D6; padding: 6px 12px; + max-height: 240px; + overflow: auto; background-color: #FFF; border-radius: 2px; } @@ -1103,7 +1110,8 @@ a.operate-reply { #file-list { list-style: none; margin: 0 10px; - padding: 0; } + padding: 0; + word-break: break-all; } #file-list li { padding: 8px 0; border-top: 1px dashed #D9D9D6; } @@ -1118,6 +1126,9 @@ a.operate-reply { #file-list .info { text-transform: uppercase; } +#btn-fullscreen-upload { + visibility: hidden; } + /** * 附件管理 */ @@ -1148,24 +1159,25 @@ a.operate-reply { /** * icons */ -.icon-sprite-hack { - background: url('../img/icons-s2ebed63329.png'); } - -.i-edit, .i-delete, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow { +.i-edit, .i-delete, .i-upload, .i-exlink, .mime-office, .mime-text, .mime-image, .mime-html, .mime-archive, .mime-application, .mime-audio, .mime-script, .mime-video, .mime-unknow { width: 16px; height: 16px; display: inline-block; vertical-align: text-bottom; - background: url(../img/icons.png) no-repeat; } - .i-edit:hover, .i-delete:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover { + background: url('../img/icons-s93f9ba6074.png') no-repeat; + text-indent: -9999em; } + .i-edit:hover, .i-delete:hover, .i-upload:hover, .i-exlink:hover, .mime-office:hover, .mime-text:hover, .mime-image:hover, .mime-html:hover, .mime-archive:hover, .mime-application:hover, .mime-audio:hover, .mime-script:hover, .mime-video:hover, .mime-unknow:hover { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75); opacity: 0.75; } .i-edit { - background-position: 0 -32px; } + background-position: 0 -48px; } .i-delete { - background-position: 0 -16px; } + background-position: 0 -32px; } + +.i-upload { + background-position: 0 0; } .i-caret-up, .i-caret-down, .i-caret-left, .i-caret-right { display: inline-block; @@ -1186,35 +1198,35 @@ a.operate-reply { border-width: 4px 3px 4px 5px; } .i-exlink { - background-position: 0 0; } + background-position: 0 -16px; } /* 文件类型图标 */ .mime-office { - background-position: 0 -80px; } + background-position: 0 -96px; } .mime-text { background-position: 0 -176px; } .mime-image { - background-position: 0 -48px; } + background-position: 0 -64px; } .mime-html { - background-position: 0 -96px; } + background-position: 0 -112px; } .mime-archive { background-position: 0 -192px; } .mime-application { - background-position: 0 -112px; } + background-position: 0 -128px; } .mime-audio { - background-position: 0 -224px; } + background-position: 0 -208px; } .mime-script { background-position: 0 -144px; } .mime-video { - background-position: 0 -64px; } + background-position: 0 -80px; } .mime-unknow { background-position: 0 -160px; } @@ -1350,7 +1362,7 @@ a.operate-reply { background: #F3F3F0; font-size: .92857em; } #wmd-preview code { - color: #B94A48; } + color: #C13; } #wmd-preview pre { padding: 1em; } #wmd-preview pre code { @@ -1417,18 +1429,24 @@ a.operate-reply { margin: 0; padding: 10px 20px; border-bottom: 1px solid #F3F3F0; } +.fullscreen #tab-files { + position: absolute; + top: 52px; + right: 20px; + width: 280px; + z-index: 1001; } .fullscreen .wmd-edittab, .fullscreen .typecho-post-option, .fullscreen .title, .fullscreen .url-slug, .fullscreen .typecho-page-title, .fullscreen .typecho-head-nav, -.fullscreen .message, -.fullscreen #upload-panel { +.fullscreen .message { display: none; } .fullscreen .wmd-hidetab { display: block; } -.fullscreen .wmd-visualhide { +.fullscreen .wmd-visualhide, +.fullscreen #btn-fullscreen-upload { visibility: visible; } /** diff --git a/admin/img/icons-2x/icon-arrow-down-2x.png b/admin/img/icons-2x/icon-arrow-down-2x.png deleted file mode 100644 index 1fefa5a038843067e87c6af832feaaae8b3246be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38bP)BRO++X?@+SpzXf6o(1zS}*NT z#~Of|Fm80iC0#%-$`=_xRYfaA=Z#FP!g$ljd z0EB;9p+-Mt0OF<;NZSPYC+Jmgm;yGX~!0Ft86L11f-~gpm VQyug34nF_@002ovPDHLkV1nHGY%2f& diff --git a/admin/img/icons-2x/icon-arrow-up-2x.png b/admin/img/icons-2x/icon-arrow-up-2x.png deleted file mode 100644 index b7a7e475a142c75c4bd942faa39894010296eb28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmV^ z7y%>jia^eJhy7-lIqfJ;DFyHS3E`!bEyj3hil_;+@S_C=*!`@@*Nx(i9ivyP5Gz3F z;rDo58Wmy%2t5vmvr2`izyo?(Lac(VV1S;M5UF4j7@(&GL@HPX80cvUwu-3&0eV`3 zrD94zfSwj$shAR=uYP@>68JihzGnrDfDtePH*z+LB0W0_^cAk{u_(411uA zv9+et={?bC^s8>~=;&DH^Z9NN7gjjFdn+m`q!3GUEdcV1c<#4&YXcIVCSkn>S=9FS z_5#1(FNblRY50LGUP7`}+E3Lpqo7rA#JM&&ifkK4Gh=sY&8+TRCw)HYr_6%N8*6 zwHTUMHjzeytRfPL^r$g5iOKu!vXxO{+a#W_VZtM9L$Au0TLH-TVC<#m$O-tYlbcEM zCKrDW=@Ugp?wRQKxylC=W)uLh1>lMTMM6G6z&jmt(wX5Qia+RN6Rf|#e*mFBM1Hp7 zLT6`ZmDoM;czk*=7<>cSLIEKDh&aRvZ;|mt4f0z24L{;zEN!cke@jctjN;?| zcm|TmWWdAhcLLrt14l+jM^{%>RXuY`q+{Im5ZCM;SdodRh}}r+Bi&Ee;aUjS3%YED zOm>HCLGC>VxSS6;%eMsbyTmGT$yX$p*ks_;c#c0nF7J!c(CegtGIJ~yJy5!vl&6`c zY{x#&!N;(PkAuyCxYB)^ZHbpEf(jtdN)oChKCl^DC3Nd^=~vERK^@k#+KPr1_VG8_({C!p4j zyN$&+6bhZQ+jS1%mRrz(^GR_8NTaXJ=TC+!==dNJ>#>unF(0Vq9Mq?97++V4srRN* zsjD~`4}};gqL-rTCfGxjFK?MhBno+~Vvs*n$!GM}FTJ=Rz$113C0BD&roCzsPM+{V(7*%AMfr!x9@Q00000NkvXX Hu0mjfTzLfp literal 0 HcmV?d00001 diff --git a/admin/img/icons-s2ebed63329.png b/admin/img/icons-s2ebed63329.png deleted file mode 100644 index 1a21b00db86f28c16f66170b54408187047fd4ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 941 zcmeAS@N?(olHy`uVBq!ia0vp^0zmwMgBeKLWr|z`Qu70RLR^8gO70|wga+q|sm_&C zoU5j~R7`fMnC1dxfY3D8(uuB>Q(P;jx>iBZG*_TtH3+#?Om?f9;#M^kjHbB(MZjp% zq)9W8z&ba#&6_uG^R(UJ>Au6ueaDU+JKfxNdb;oQ0wRx{V6Y1Yb|ZoR|NpmKzjYAk zMAMQWzhFjoj&L7G2c`NxZ&j~}2?w^_4gKyE(Qx+9=CA)nLsz}}FD5N|<+_pahwJ~7 z8th-bns@Qve+J3iTP+L>OdXysjv*Dd&Q8CbcgsPbE&Z+P#v==hRG3zK?Df$P2yp)N z&)>l%)Kok-KWa(V!qAOD3zn{X{C3@5_s0^GG#Dnaey)5r|K??h$Jqt;65H5UCo@cG zjxTKyVCh_M^XjAS^nb7K{uWwr$FD!Uk>yg`fsS)hceZVwbHx|wQif&rN|KmMl^fr}@R3nZ5b!Q&T<9_DJA()qC;I6^c^30c2sN~3`s5Rd021zTv z^|wyT2x69zzSwd9c#L`o!{QlhYjR9x70byRP8K_I{=-rCXs&&K_7ojh@%PoUQ%sAu z#j`uA{J8aOwrWIH|HKXN>tnPMZdzIxm9ZV$+pn9NzQC-mSUUbz>(yhn%Y!~K9bP`o zlPhus&%$5(F75Dk4mZ(Fzy+abyD0v z2QK=UTlSD?{YOPPi^!%2-*<1HTDsv>g1V z9sRj{+1723tjra&7cGgKRw-PBc%cdh>0M4QI{wPoL{nIdmNfOkDZxh2PQo$y>5b ztZX#iTD)aiX{O^?&J}B(oBq7{c2<2vb#&H@y}eu4Gjrrv=qH?8@KmvMV{Egs*8_#~ z+`4mWwdUMy3;GZ-zyGXa-foKx&%Iq2-~W{ucvaRc{pS6eC#O^1^8Yk2Y?##aLQL+c zRmRg-)7xay?4QnG`KnaNr)EaUT>A_To7>JN5&5?+CQRBZR~0ERjq%ajGneI-|CYED w{JVYk&*EmgWqet>1v}Xpx7XU0*Z*N(dhhnJv`d~>fQg#H)78&qol`;+0L}fqLjV8( diff --git a/admin/img/icons-s93f9ba6074.png b/admin/img/icons-s93f9ba6074.png new file mode 100644 index 0000000000000000000000000000000000000000..91cae2f0025233a3d0f90e3a31d62d749f55bf34 GIT binary patch literal 1283 zcmeAS@N?(olHy`uVBq!ia0vp^0zmwLgBeKL?icf7U|@6!@Ck7Ra#eCCIV3bVS4?%T zoZ?(H)um#xOT{!7AOnP^xt30Jt(@XoIn}iaf~L6w1*<{GtzxoU)fBg?sbDnC4JZOe z4PdYe4A!~1Z3KhOV6b)T)@`1)+qP}n;px7^%YDa=9Xs9Jc6z$+^a3J}op`}6s)F5A z0{?*^aDF~89CJ#7{DK+TIl_G$9hB<(yj8s>CLGvyH}tzxM8nxXo4@{NVqxPH;}sW? zmKSBea^1-I!}b5%Vou@FNy!b}{q}z8#jU*)X3tx@Zrh$C$4}qB|LF0{S0BH8{bP|? z(l>MNyrpZl96NRH;-#y1pTGI^`PaYy47(zIL>L&DnLJ$_Ln>~aopRq>Bv9n|`8W4A znx=QH6`V0HSP)#X3)s?(2Otec^|=FQJH-)qkAeE!d&_P{^I8*DWK&W~aaG3meNzfwP4 z>EqPJY(H+CIr!$!+ly_=`Rg(sq?>&A>~LF{`(@Xmo*#%&MKDjTf1h*X8|O z_pSdxh|l(G2UfeN9(SxU&CwLv{QgRyzq>+Clb3RwovElfL;4YM#dkCM<_9P5@;Y6? z-Ee58gX9Zl(|7MTHi*0qkNuS#G?i0LxUkgD_EO4Z&RIQ-A*O$SKmFb8qsW=L?;@L| z-h?)W>6u#`6ayBD{M?hHJt?#GF?Z1V>!KN^Q}2czTAJD&$!M6M z`&GfIIfpCApOwqw)^SF+bWQ8l9oL%vU$(KaiCc3o)zP71#{0xoEl#t)zyJAdBKJCD z&7y0mRmbaff1CDS`n*w0&z8?i?}%aOCRu-%>-WkmG*y?~xU0#?Uaj>lS8hgvZo#vK zshJnpW^4%Epm)r!_C;Mw*bdt@Y6i(&3uWGSf82dn^WycUjn&$jt($M(*4(gs(VutR zd#5jJ-#q=qH6w<@e9xKZ7`tow#JhYyFe6Fh^k>JI^tl;H-bH5n zY;tzj$^6Ybd@l4`zT7dhz~_f+Y-AlaoGuaPDwjV}{@phC)Z@P&cIdxJlVs2^yTrsz+r6PWz0?9SprTKish$mj$VxVeI;VK zQ6p|V9xjzyJhaoxY3tD$X+jhiplDRKPj qwtU^EqQzK#@lOErT8AWQff{~J-BbxvcYUCn7(8A5T-G@yGywq9%|(j< diff --git a/admin/img/icons/icon-caret-up.png b/admin/img/icons/icon-caret-up.png deleted file mode 100644 index 69d8bb87c84f69e65b2ba8510706a015b0ade675..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr^wkfByfsXI5?K6gsQ0 z_we0@$jxc3O$Pf4l8%USPgeIAOHEJT&vog~=jZ-!@7%d_{RYn=$qt9J!HrTbjuNMi zEt9X-ahTitresds!4FK6E<0{hZoYnFPt!wImF3FWY#TRLu^wi9v5VuQVT^+Z^R7Pz b1`G@@0yLf9&fIkl=mrK)S3j3^P6Nkl2PC&SNOXd2louRd&059lwBubg{)RMj#NVBR+wB zr09H%az_Fka=Bbf_<9Z~wyx`MIyuNe_()b*B{;+7pP8n)8Hq$1og@y{edioZ6TeJB zp{Lwo4RcjhtJQg?IK;6|=Rbh{`3Gcoa!w>yFf?6Ip-|{&y diff --git a/admin/write-post.php b/admin/write-post.php index 50e2b4a6..700524aa 100644 --- a/admin/write-post.php +++ b/admin/write-post.php @@ -46,6 +46,7 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);

+