From 503f1d1e92fdfeed8ab906cb00cc03a51435568b Mon Sep 17 00:00:00 2001 From: llj Date: Sat, 13 Apr 2013 17:30:42 +0800 Subject: [PATCH] [icons] replaced some image icons with font icons * replaced all the image icons that's can be replaced * added 'seafile-font'(offered only 'sf-icon-share' so far) * make other browsers that doesn't support ':before' such as IE 7 can show the icons too --- group/templates/group/group_info.html | 21 ++---- group/templates/group/group_info_for_pub.html | 21 ------ media/css/font-awesome.css | 60 ---------------- media/css/seahub.css | 64 ++++++++++++++---- media/css/sf_font/seafile-font.eot | Bin 0 -> 1690 bytes media/css/sf_font/seafile-font.ttf | Bin 0 -> 1512 bytes media/css/sf_font/seafile-font.woff | Bin 0 -> 1208 bytes media/img/delete-20.png | Bin 631 -> 0 bytes media/img/download-20.png | Bin 562 -> 0 bytes media/img/gray-star-icon.png | Bin 503 -> 0 bytes media/img/gray-unstar-icon.png | Bin 466 -> 0 bytes media/img/minus-16.png | Bin 159 -> 0 bytes media/img/modify-16.png | Bin 856 -> 0 bytes media/img/plus-16.png | Bin 376 -> 0 bytes media/img/search.png | Bin 402 -> 0 bytes media/img/share-20.png | Bin 872 -> 0 bytes templates/base.html | 60 +++++++++++++++- templates/pubrepo.html | 4 +- templates/repo.html | 16 ++--- templates/search_results.html | 2 +- templates/snippets/bottom_bar.html | 4 -- templates/snippets/my_owned_repos.html | 10 +-- templates/snippets/myhome_extra_script.html | 2 +- 23 files changed, 132 insertions(+), 132 deletions(-) create mode 100644 media/css/sf_font/seafile-font.eot create mode 100644 media/css/sf_font/seafile-font.ttf create mode 100644 media/css/sf_font/seafile-font.woff delete mode 100644 media/img/delete-20.png delete mode 100644 media/img/download-20.png delete mode 100644 media/img/gray-star-icon.png delete mode 100644 media/img/gray-unstar-icon.png delete mode 100644 media/img/minus-16.png delete mode 100644 media/img/modify-16.png delete mode 100644 media/img/plus-16.png delete mode 100644 media/img/search.png delete mode 100644 media/img/share-20.png diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index 78aead0c80..250ea06d40 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -99,9 +99,9 @@ {{ repo.owner|email2nickname }} - {% trans + {% if is_staff or repo.share_from_me %} - {% trans + {% endif %} @@ -129,15 +129,15 @@ {% for cmt in recent_commits %} - + {% if cmt.tp == 'Added' or cmt.tp == 'Deleted' or cmt.tp == 'Removed' %} {% if cmt.tp == 'Added' %} - + {% else %} - + {% endif %} {% else %} - + {% endif %} {{ cmt.repo.props.name }} @@ -183,11 +183,7 @@ {% endblock %} {% block extra_script %} - {% endblock %} diff --git a/media/css/font-awesome.css b/media/css/font-awesome.css index d83839a28e..d97dfaad5a 100644 --- a/media/css/font-awesome.css +++ b/media/css/font-awesome.css @@ -21,34 +21,8 @@ text-decoration: inherit; -webkit-font-smoothing: antialiased; vertical-align: baseline; -} -/* more sprites.less reset */ -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; speak: none; } -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} -.btn [class^="icon-"].icon-large, -.nav [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large, -.nav [class*=" icon-"].icon-large { - line-height: .9em; -} -.nav-tabs [class^="icon-"], -.nav-pills [class^="icon-"], -.nav-tabs [class*=" icon-"], -.nav-pills [class*=" icon-"], -.nav-tabs [class^="icon-"].icon-large, -.nav-pills [class^="icon-"].icon-large, -.nav-tabs [class*=" icon-"].icon-large, -.nav-pills [class*=" icon-"].icon-large { - line-height: .9em; -} li [class^="icon-"], .nav li [class^="icon-"], li [class*=" icon-"], @@ -109,40 +83,6 @@ li [class*=" icon-"].icon-large, [class*=" icon-"].fright { margin-left: .3em; } -.btn [class^="icon-"].fleft.icon-2x, -.btn [class*=" icon-"].fleft.icon-2x, -.btn [class^="icon-"].fright.icon-2x, -.btn [class*=" icon-"].fright.icon-2x { - margin-top: .18em; -} -.btn [class^="icon-"].icon-spin.icon-large, -.btn [class*=" icon-"].icon-spin.icon-large { - line-height: .8em; -} -.btn.btn-small [class^="icon-"].fleft.icon-2x, -.btn.btn-small [class*=" icon-"].fleft.icon-2x, -.btn.btn-small [class^="icon-"].fright.icon-2x, -.btn.btn-small [class*=" icon-"].fright.icon-2x { - margin-top: .25em; -} -.btn.btn-large [class^="icon-"], -.btn.btn-large [class*=" icon-"] { - margin-top: 0; -} -.btn.btn-large [class^="icon-"].fleft.icon-2x, -.btn.btn-large [class*=" icon-"].fleft.icon-2x, -.btn.btn-large [class^="icon-"].fright.icon-2x, -.btn.btn-large [class*=" icon-"].fright.icon-2x { - margin-top: .05em; -} -.btn.btn-large [class^="icon-"].fleft.icon-2x, -.btn.btn-large [class*=" icon-"].fleft.icon-2x { - margin-right: .2em; -} -.btn.btn-large [class^="icon-"].fright.icon-2x, -.btn.btn-large [class*=" icon-"].fright.icon-2x { - margin-left: .2em; -} /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen readers do not read off random characters that represent icons */ .icon-glass:before { content: "\f000"; } diff --git a/media/css/seahub.css b/media/css/seahub.css index 5a7348a781..9f922b31b4 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1,6 +1,22 @@ -html { - background:#fff; +@font-face { + font-family: 'seafile-font'; + src:url('sf_font/seafile-font.eot'); + src:url('sf_font/seafile-font.eot?#iefix') format('embedded-opentype'), + url('sf_font/seafile-font.woff') format('woff'), + url('sf_font/seafile-font.ttf') format('truetype'); + font-weight: normal; + font-style: normal; } +[class^="sf-icon-"] { + font-family: 'seafile-font'; + speak: none; + font-weight: normal; + font-variant: normal; + text-transform: none; + -webkit-font-smoothing: antialiased; +} +.sf-icon-share:before { content:"\e001"; } +html { background:#fff; } body, h1,h2,h3,h4,h5,h6, ul,ol,li,dl,dt,dd, @@ -162,6 +178,21 @@ p { color:#808080; font-size:12px; } +.icon-plus, .icon-minus, .icon-pencil, +.icon-star-empty, .icon-star { + font-size:16px; + line-height:1; +} +.icon-plus, .icon-minus, .icon-pencil { + color:#444; + margin-left:3px; +} +.icon-star-empty { + color:#d0d0d0; +} +.icon-star { + color:#505050; +} .op, .more { font-weight:normal; @@ -175,6 +206,13 @@ p { color:#803; word-wrap:break-word; } +.op-icon { + font-size:20px; + line-height:1; + color:#888; + cursor:pointer; + margin-right:3px; +} .big-more-btn { padding:.5em 0; color:#777; @@ -205,7 +243,6 @@ input.btn-disabled:hover {/*for input*/ .modalCloseImg, .add, .repo-op .op-btn, -.repo-top-op-btn, #star { background:transparent url('../img/bg.png') no-repeat scroll 0 0; } @@ -1178,6 +1215,8 @@ textarea:-moz-placeholder {/* for FF */ } .file-star { cursor:pointer; + line-height:19px; + margin-left:5px; } .repo-file-list .repo-file-op { position:relative; @@ -1231,16 +1270,10 @@ textarea:-moz-placeholder {/* for FF */ } .repo-top-op-btn { font-size:14px; - padding-left:21px; } -#repo-download-btn { - background-position:3px -79px; -} -#recycle-btn { - background-position:3px -29px; -} -#repo-setting-btn { - background-position:3px -53px; +.repo-top-op-btn [class^="icon-"] { + color:#444; + margin-right:2px; } #repo-latest-commit { word-wrap:break-word; @@ -2135,8 +2168,11 @@ textarea:-moz-placeholder {/* for FF */ } .search-form .search-submit { width:30px; - padding:0; - background:#fff url('../img/search.png') no-repeat scroll 50% 50%; + background:#fff; +} +.search-form .icon-search { + font-size:16px; + color:#aaa; } #search-form { width:426px; diff --git a/media/css/sf_font/seafile-font.eot b/media/css/sf_font/seafile-font.eot new file mode 100644 index 0000000000000000000000000000000000000000..eed8a2aa9a9374ded99836ce3c0a3c762374ddad GIT binary patch literal 1690 zcmds2Jxo(k6#j18S1O<)DHTYECoMmcwDvs^6p?g*Y6wI`MK;qw{|x<+V!*9&VliRS zK{o@NgN|+;jEfit2Q@N~xEKdxVjPTy`rY?#p)q2dz3IL8JKs6?ynF9C_w>FS_^1H_ z4#?(!=ClBrH6hW&lr5u4&D5YI@$z`@WR=^STTw&;aU_w!0#S%4j~te0;;F$t%uu^X z>x`w>VIYhMt^VeLYPqX}+<_BQvDoFw)a=DafVN52e{OUv1`|A!Mh^OgODD|mhxhed zG)sAAE*mdw`@X)W{EU4%6)zSl6?%fUPQ53!a4Xs7s=om^gOpd(iTM1F@1NfhZ?O-g zNjR@po^!32axk4;T5+|&Px&!r??Qeqjsc8veJkb0Y<#7F^EgiZDav{-o=x2TbcTC# zvWusMd~xZ)l@aQ+H1)&Q*?7Lm-tpyYhljtRL6phk<(;d!y}42rWl^H+Q9+|C{z{cH zdZhhMl%u?*+NN2IhAyR%;T9H-Dl82JDOZ-m82mU z@9J@dJeQrymd+Zg%01?PMl$~d{FN=SF6Pk*bavEr4~vt7zCLrHzpKOD;%%wx3Us)= zBnFRqTf9EWi&T5_#zu2{TQJxcu;(^1fxcjHrg>Vc*QT2#Zqo>YW{{L-naZnI8OeJ; zB94hN6R@-swePqQ_f&8M8quz>gHbjVcA^KX3cG0YLSYRJU`knT+-MX&nIWzNWaQhj zv4dICtuX5W-=598X!As2jrsdlVK@1o`xmHUBA(1FBtpr2j^%2%ZrNf?l`%OlBE{mR zv)0IxrDKSFzp`g*4cdm#&u(&sfj%I{uf+0;sf2EZBl?hD`*n(j8R`$25rdZdxkl|0 z*0(0k`a?01>+#!uFH}nXT^8(?88@5sI7Cq0L%Q?(f|Me literal 0 HcmV?d00001 diff --git a/media/css/sf_font/seafile-font.ttf b/media/css/sf_font/seafile-font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..940925b1ca08447315934ec1aba33072d7c9da5e GIT binary patch literal 1512 zcmd^9J8Tm{6r8p19FrIbmThq4;)pLFkZkO8NFapBMPd*lA_Oq$kd^p{{KF0+bQV<_ zBpPVwP|{IAN#_F55JW)%h!m0NC=e2&K%kh}^BsvIMWSb=y`7nT`}Xa=w+8`WKbml2 zHkG!1s6LFWKkvnMSSM zrYESYoOkC-cXL6d`xfBT$yW;5%;K+~Uq2FWu#XlfIB&LJajlPBFO-*-6+c4c&&YkH z>OuyinBw{)y_=X-4ZR)BzMChRW_~>&2|gJ(taz+uk^IDsivZ0(3+7eg^81v znV{DPP~jF~ahlqsHNHmx4R9-!_hh$T8*rS>O)nz3DZbe;G?8qYF-fD&2?!pVn0IA1 z=}Y#I70*R78FL57-xgh|NZtqgSz3Ng0CqwvQ|1x$IjpXQhD+{)Tq0Ms(tE}G-7Isnp z&1%jfgB*$|5k-iqs9*_bWHY&9DI3XED`bD=4oz8Ba;ziIl^XvwQC6#larV8uc4p(W zjbMb`;EFgBK#IGhs`Y$UGomqVT-&)jY21j6M2uLRmV3G06>yp{)oENbBh|Qzj1K8+ zy-}=Iw0M-{A6@Z=cfX=eKDWOrp@2g;gtO~*r8pgn#pRfa#pL@He6tQSdk4s5#-vBV WJjl1Jm`rMBe%H@Fc`M1z|J)xZX~iu7 literal 0 HcmV?d00001 diff --git a/media/css/sf_font/seafile-font.woff b/media/css/sf_font/seafile-font.woff new file mode 100644 index 0000000000000000000000000000000000000000..c9a2ffcfb53946b540366d91aebff73254f96914 GIT binary patch literal 1208 zcmXT-cXRU(3GruOVA;XI%>V@KF$|0#8WT9XxhXI(FmeF#Oa=y~WcLeV@@{S+zCiX8 zplT@~mPwBYT;uNI>IM`$0OZR8u>yku1B-vKz7bID0g&$v#0mPWx3!aV6AKs^n00`B zE1;P{4@5ql$w*C10g7b+#SDPh?Dx-iH#2~OK(QG>z8ny%FlYTgl95|d0TkN-FKL$tMm?4s+nUuKEwcyT8?u!e~-ZnpcX3zI&jmsF5*BDNY@X%W(RC{u1 ziP#K&iJp$K`5XQ&@_npm&!1T)u#3&-$sRW+MmyD*#8+Z(+;ke$xWCQPHPE>q!<|ub zxPjxy0_*8pLRe%~c6lx}r%d+t$=4TUO?v{oe+L#i=LT`c<^ocwd`5adGh*zQnZL2=_lVb(1&T zYW*?M!a<}z==olYbN}~x1+1C2@ye3rEf;JG)t)N-{=8+rb4JJZOJ{e?vHBCGxO7j* zp{+JA(^ajj1LsXSUi~=yoYm6#Z|aM#Rc(8It(c$j*MjrulG_p&FDbgGBqyF%;#J=q zQF&{jyryT_(^E@Nom|j<>2hUE>B;8;zJA)@Pj9JT8>|+5XxZDRAzoVB1)m+dqP4Do zIq~5vn^VpQ^Iz7h)B_`^Voq{GLP82dlkv9hbImU{?|oQlAjROdm2DS9E+rx10do>3 zn?OQR0*jNtNv3Cp!01h2Foo((vpHbV*f_PZIdJC1NsWyM`Ml!O1(G$=5`gMc(;Ao= zStctgoHcDd_>l22JKM3g|LhVb64DYfQW6pp54l7dCI~Y83FkI~x+AS2L6XglP2dCL zCy9eKVrV7Orr7bJAHK*ym7YcmB zuyW<4nm<`^k>e?^#eeUenJu4iP@46p=p**WoT>*a zP6?|&4w}dRShBoE@_eL-w`KRIu$jM$!=G`Q+erCWK0Uf)%JaJw$0qqd-udZ%k4l-z z78#egE0+sf4ByWBHlgNndC>ls-FIf3`F|j8Zl8zi+WNIW@?R~Ldh&IRNT6(EI`5Sm zzV>e>cZa^c_U?VzNrAtoj$56me0nfilzryyV$1huu5a``eB;|(?$Fw|E9BYC-K2rO P1cgc30bn6j%fJEv9|_JC literal 0 HcmV?d00001 diff --git a/media/img/delete-20.png b/media/img/delete-20.png deleted file mode 100644 index edead19dccf89a23a4232492b11beafd06e683b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyr3 z3=tm&fy+k#00H+&L_t(I%cYdNj@m#JhX1*MNKCw1Aqt)#A{9+q@GDRykC-jpQEUO0 zQ${o>9T%^J09i5@vw&>RoD{*tc!5aE=|*S%&;Pl2fD7R`4tl*Fu7%?`S91(EqTB6y zMD*!Qz?g4Y)@S@LE`4<}nb2~%B+v86^E_IuRx}!o=$4k{65oUnKL9`ofqK18{eFLK zS=Qsx@v_lqJPZZ{#@Jt}QtErN*?hX_(sfj%D_sl=|7}biNpd@t7nDIOo~kf#{!>bB@>7*JZU@{e970I#t`Y zpV#X(O{Y^D4u|CXKFww`n$PDH1Obi5WAc5UHk%FEw*8#do;hr_S^xmUFqmnYFijJ_ z@1s(w;BYtq0E)#T0H9nhqfjWoFbtN}0szlD&6ky)(;;L_&)&TX%!1P%GR96oA;it~ z<2RF>pI|94JE(U7^A7IPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyr3 z3>*)xn5Aw200FW|L_t(I%iWT(Yui8+#=m!WG8$5Fw+1>^^nb{bp<_eRq0nUTkan?A zWFtCe3j~tMT)lKDrE^2TCXgXxny%eUu_+~xYzcS>xU%JY9efIkEu{`*2>mAMy?Z~t zclQx8tFnskPmic?%=6J`w3gLp<}Uzd2U?A+ zqe&P5n7ko@d)BSMv^(qUpHg`sW`;558alc9!&v$M1gf0if`}l5n5xa>@a4BN;Ny?$ zV!2#q045!k13Jd@kK+G#bwUI7Eavj+f&&-pR_Ml=7|PINzCB2qFIX zzW+OK<@v#2@X3BZx+R}mQ55w7M6T<;nOb@2$JYYrU$qUQGTUxAI|s0cWPbxT4b6YXATM07*qoM6N<$g8Z%Y ArT_o{ diff --git a/media/img/gray-star-icon.png b/media/img/gray-star-icon.png deleted file mode 100644 index a72a897834ed07ec509d5c1b43964457540c9b98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmVWk+dh>Fxkg0~9**Rxs&WI60tB zKuT#aPyEMXjNgC;xLQhie=X4|$q)9Lj18e@zvB;D?# z_uAQ$w2^b(KemNVD3bR65jZ+M{l2J%7`&6T(Zzd%>jt_$$e;(aX&c+J{YKIw z+dq3?4@ZR*W4uw_&p<4t+{`&Y1}@uvR#kat^cG@_uYfO$#p2$4K0jP$7ecru=_PQz tl=5jv{}=n`ynNmOv)ODlgmAih{{ztawzf0CvylJ*002ovPDHLkV1mt}-CF%wRV^GQri-%+f{XIs^7yH2dirBuM}E}FYt2ON>%;FxT@A> zMcODmY3)xXxt3(hxd#r3MX+bH8I z4q$hipf^RZgwHrL@jPwsFz(?QL70(Y)*K0-AbW|YuPggqMoDHZy~F=rdjW;yJzX3_EKVmU wNU$>VOITZ3{R>WF5MHV$QNiqXFoA(#ejL;M-Z^%cfl3)XUHx3vIVCg!09`96Hvj+t diff --git a/media/img/modify-16.png b/media/img/modify-16.png deleted file mode 100644 index eca2d278201688b9a7348f25badbec4ec4882e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 856 zcmV-e1E>6nP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*Y~ z0~Ru*49@xh00P)aL_t(I%Y9SNPugG@eoH^2m4fIfk;D**N}?HYV!A|@m_foAZ6e0Q z4zQccZl0%qf%D9DH^GAkqb6-9k$4+&X;3+s5Dl1sXk3UbrDRaM!-SBG?YX|+^L)?q z{=ncrU|AM8j)SG8rI!eyO_$3RvREu2ilWeHG&U|SE^^qvh)+*XAP544LZL8C)B7Yz z0*>Q)v)Keq)39c<38E;v4ZQ@~WWV3PM$`1p(9jS(K0a2judgvp(?C%aogfIXTCJOS zuitr|2fyFHHa$JPMN!n?`T6;ebUHn&Y1(UoASMw)FfcFxwOVZw^~(Hg`>WAtBr284 z+4lDKo98D%mSvBorl#Ie6s6Z{H9*~&IgSICWjmR(*=#x9W4 zRp|6U5CjMW0&5yjiH8;!=Y!{OKs1OjgX03wk{)^4{i6bglU zrBYc=CX)v&%Yq;XoxT`IlGKaEA~rTQhEo)!+iW%~hGCyqS6BJDxw+YVKCj-~+^ioS z9v-Z$taONNAd|_2DT)HJEJJ^PKSq+I=61VTilWStB-P91^7`@dag1RY*xTFtYwZz2 z2oOSgtJT6(RfWF3K7-k8HrMNQ5JfT4wyo=W&x=K}ENhCQ;Hs(uhGBZCRKi-V*3bL< i`;R=&fA8LdUib~<3}y9a`>19B0000QL70(Y)*K0-AbW|YuPggqMoDH(sgvnGHb9{to-U3d7N?I+ zHuO7UAmIA{MwrTWPtjb)%xPvpch1UwGn&&pulNnG&eC3yR<0EjI9572PS&|~BSiCt zgh+&9ow@Ssn{{%+Oo`9d8m7%(_EMCgB(^+0^y)gD)9shHGNq@9Hgq_+>}O|a`2NqG zVgDxfqi1eEO|vUL=USXRYuO3Q>4wG(HM_cvj=k|;d2Xji_THJ~3i8wmF~A5W{r9 zqVIfZY`nMTd@+XXTv3Uq=88uW*DamG&QN~s*72=;8U`+3)P?^4*RNripB^^Ft4Qt( QFbo(xUHx3vIVCg!0K1=$DF6Tf diff --git a/media/img/search.png b/media/img/search.png deleted file mode 100644 index ad1c43493764d2bdd4679562c38604030f80b533..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmV;D0d4+?P)XRRn`qnx-qU% z<`csPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyr3 z3?B=E*fO*L00QVqL_t(I%bk=XQsQn%!Cy; z>RP9n>aMS=imIPbg6-;Dht6Gh0RWjyW`XbfdjL!mLfn^9Ubb!fE8#!Pah#-5>IyTD z#0w#ASeCU-mI`ZaZJp$K-Wg_|PDC8}nYj|cQ&B1~2!fdaCWgNhT6A3ZS71X&V&prW zPOtWT{~R;V8RdF6EjmDWd6J8sGBZ-Clwq3Y;vfieTI*F|S`0ul^GM5x=yNuwinTDb)=6fL`a)6f04O2EZ7Jmu zB6^cbr91#wm70bn^Vi_S_KUv&?;Y*IJ#<0V= zt9{?^`a{W|gb>F8+;Ls^-Dsey{e<<^TS57Jo(2X6_9>;B0hEUsKM03+Y4i{gy(Xdy zrfFWVZMz2mT3T9W2SG5dtgP%!Q&W?NsAsucP7DqXRx?=Q8sO05Jd`q?Cso$LXRvX9gZReMQS~U6)ML9OHT3Zl%<*f)VloNM;s= zgB^>-7W`3d_MJ{5zvC(ZAfM02`}_NkYpolYd2G1H1xv+b7{<7o6+8IEt0N; zQtCW2Pb~t>{FBt%d)xve2hR5EQCM$UxD2e3anAEO{ZhA*xr)#aChf= y0Kf~}ylz=mg_QD`VHh1!%A{pkjjzXF9sUVtrb>SnLYM~t0000 - +